- 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, 1 insertions, 1 deletions

diff --git a/upload.php b/upload.php
index 4f1ac6c69..286f9e051 100644
--- a/upload.php
+++ b/upload.php
@@ -274,7 +274,7 @@ if ( isset( $page['waiting_id'] ) )
 else
 {
   $advise_title = $lang['upload_advise'];
-  $advise_title.= get_cat_display_name( $page['cat_name'], ' - ' );
+  $advise_title.= get_cat_display_name($page['cat_name']);
 }
 
 $username = !empty($_POST['username'])?$_POST['username']:$user['username'];