aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgweltas <gweltas@piwigo.org>2004-12-23 14:59:37 +0000
committergweltas <gweltas@piwigo.org>2004-12-23 14:59:37 +0000
commitac1b8354f154edc903c9fa001a1f7fdb2db82b65 (patch)
treed3c6a5d4110f7f384a1c0f91ce60006e3a408d10 /include
parenta6d104e98f2dcb2f1de03fb13ce43083c66274a4 (diff)
- User permissions template migration
- Categories inheritence has not yet been done git-svn-id: http://piwigo.org/svn/trunk@655 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/functions_category.inc.php3
-rw-r--r--include/functions_html.inc.php1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 5c76dd065..1c04c70d2 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -761,10 +761,13 @@ function display_select_cat_wrapper($query, $selecteds, $blockname,
{
$result = pwg_query($query);
$categories = array();
+ if (!empty($result))
+ {
while ($row = mysql_fetch_array($result))
{
array_push($categories, $row);
}
+ }
usort($categories, 'global_rank_compare');
display_select_categories($categories, $selecteds, $blockname, $fullname);
}
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index c60abc778..c5f4ee06b 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -222,7 +222,6 @@ function style_select($default_style, $select_name = "style")
* returns only the categories name without links.
*
* @param array cat_informations
- * @param string separator
* @param string url
* @param boolean replace_space
* @return string