- in admin menu, status option for categories is not "permissions" but

  "private or public" choice = different language item

- get_cat_display_name changed : use $conf['level_separator'] to unify
  presentation

- default values for category properties commentable, uploadable, status and
  visible (set in include/config.inc.php) used for category creation
  (admin/update, admin/remote_site, admin/cat_list)

- use mass_inserts in admin/update for inserting new categories

- only one query for counting the number of sub categories in admin/cat_list


git-svn-id: http://piwigo.org/svn/trunk@642 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 5 insertions, 6 deletions

diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index f1a8610db..2ff918ae4 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -159,10 +159,11 @@ function style_select($default_style, $select_name = "style")
  * @return string
  */
 function get_cat_display_name($cat_informations,
-                              $separator, 
                               $url = 'category.php?cat=',
                               $replace_space = true)
 {
+  global $conf;
+  
   $output = '';
   $is_first = true;
   foreach ($cat_informations as $id => $name)
@@ -173,7 +174,7 @@ function get_cat_display_name($cat_informations,
     }
     else
     {
-      $output.= $separator;
+      $output.= $conf['level_separator'];
     }
 
     if ($url == '')
@@ -205,17 +206,15 @@ function get_cat_display_name($cat_informations,
  * the categories name without links.
  *
  * @param string uppercats
- * @param string separator
  * @param string url
  * @param boolean replace_space
  * @return string
  */
 function get_cat_display_name_cache($uppercats,
-                                    $separator,
                                     $url = 'category.php?cat=',
                                     $replace_space = true)
 {
-  global $cat_names;
+  global $cat_names, $conf;
 
   if (!isset($cat_names))
   {
@@ -242,7 +241,7 @@ SELECT id,name
     }
     else
     {
-      $output.= $separator;
+      $output.= $conf['level_separator'];
     }
 
     if ($url == '')