- 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, 2 insertions, 3 deletions

diff --git a/admin.php b/admin.php
index 3a19def75..ebed49524 100644
--- a/admin.php
+++ b/admin.php
@@ -30,7 +30,6 @@ define('PHPWG_ROOT_PATH','./');
 define('IN_ADMIN', true);
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
-
 //--------------------------------------- validating page and creation of title
 $page_valide = false;
 $title = '';
@@ -85,7 +84,7 @@ switch ( $_GET['page'] )
      if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
      {
        $result = get_cat_info( $page['cat'] );
-       $name = get_cat_display_name( $result['name'],' > ', '' );
+       $name = get_cat_display_name($result['name'], '');
        $title.= ' "'.$name.'"';
      }
    }
@@ -202,7 +201,7 @@ $template->assign_vars(array(
   'L_CAT_UPLOAD'=>$lang['upload'],
   'L_CAT_COMMENTS'=>$lang['comments'],
   'L_CAT_VISIBLE'=>$lang['lock'],
-  'L_CAT_STATUS'=>$lang['permissions'],
+  'L_CAT_STATUS'=>$lang['admin_menu_cat_status'],
 
   'U_CONFIG_GENERAL'=>add_session_id($conf_link.'general' ),
   'U_CONFIG_COMMENTS'=>add_session_id($conf_link.'comments' ),