Parameters are more clear and improved comment

joomla · Jun 6, 2016 · 32c9048 · 32c9048
1 parent ad1dfa3
commit 32c9048
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/libraries/joomla/form/fields/folderlist.php b/libraries/joomla/form/fields/folderlist.php
@@ -201,7 +201,7 @@ protected function getOptions()
 		}
 
 		// Get a list of folders in the search path with the given filter.
-		$folders = JFolder::folders($path, $this->filter, $this->recursive, $this->recursive);
+		$folders = JFolder::folders($path, $this->filter, $this->recursive, true);
 
 		// Build the options list from the list of folders.
 		if (is_array($folders))
@@ -217,10 +217,8 @@ protected function getOptions()
 					}
 				}
 
-				if ($this->recursive)
-				{
-					$folder = str_replace($path, '', $folder);
-				}
+				// Remove the root part and the leading /
+				$folder = trim(str_replace($path, '', $folder), '/');
 
 				$options[] = JHtml::_('select.option', $folder, $folder);
 			}