Fixes for folder element.

Fabrik · Feb 1, 2017 · 0d3a722 · 0d3a722
1 parent 46e2a40
commit 0d3a722
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/plugins/fabrik_element/folder/folder.php b/plugins/fabrik_element/folder/folder.php
@@ -56,7 +56,7 @@ public function render($data, $repeatCounter = 0)
 			{
 				$opts[] = JHTML::_('select.option', $folder, $folder);
 
-				if (is_array($selected) and in_array($folder, $selected))
+				if ($selected === $folder)
 				{
 					$aRoValues[] = $folder;
 				}
@@ -71,7 +71,7 @@ public function render($data, $repeatCounter = 0)
 			{
 				$opts[] = JHTML::_('select.option', $file, $file);
 
-				if (is_array($selected) and in_array($file, $selected))
+				if ($selected === $folder)
 				{
 					$aRoValues[] = $file;
 				}

diff --git a/plugins/fabrik_element/folder/layouts/fabrik-element-folder-form.php b/plugins/fabrik_element/folder/layouts/fabrik-element-folder-form.php
@@ -5,8 +5,9 @@
 
 ?>
 <select id="<?php echo $d->id?>" class="fabrikinput inputbox <?php echo $d->errorCss;?>" name="<?php echo $d->name;?>">
-	<?php foreach ($d->options as $option) : ?>
-		<option value="<?php echo $option->value;?>">
+	<?php foreach ($d->options as $option) :
+		$selected = $option->value === $d->selected ? ' selected="selected" ' : ''; ?>
+		<option value="<?php echo $option->value;?>" <?php echo $selected; ?>>
 			<?php echo $option->text;?>
 		</option>
 	<?php endforeach; ?>