- 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

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);
 }

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