Changeset 642 for trunk/picture.php

Timestamp:

Dec 12, 2004, 10:06:39 PM (19 years ago)

Author:

plg

Message:

• in admin menu, status option for categories is not "permissions" but "private or public" choice = different language item

• get_cat_display_name changed : use $conflevel_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

File:

• trunk/picture.php (modified) (4 diffs)

trunk/picture.php

@@ -349 +349 @@
       if ( $conf['mail_notification'] )
       {
-        $cat_name = get_cat_display_name( $page['cat_name'], ' > ', '' );
+        // locally, we change the $conf['level_separator']
+        $conf_separator = $conf['level_separator'];
+        $conf['level_separator'] = ' > ';
+        $cat_name = get_cat_display_name($page['cat_name'], '');
+        $conf['level_separator'] = $conf_separator;
+        
         $cat_name = strip_tags( $cat_name );
         notify( 'comment', $cat_name.' > '.$picture['current']['name']);
@@ -390 +395 @@
 if (is_numeric( $page['cat'] )) 
 {
-  $title_img = replace_space(get_cat_display_name($page['cat_name'],' > '));
+  $title_img = replace_space(get_cat_display_name($page['cat_name']));
   $n = $page['num'] + 1;
   $title_nb = $n.'/'.$page['cat_nb_images'];
@@ -443 +448 @@
   'WIDTH_IMG' => $picture_size[0],
   'HEIGHT_IMG' => $picture_size[1],
+
+  'LEVEL_SEPARATOR' => $conf['level_separator'],
 
   'L_HOME' => $lang['home'],
@@ -769 +776 @@
   if (count($cat_array) > 3)
   {
-    $cat_output .= get_cat_display_name_cache($category['uppercats'],
-                                              ' → ');
+    $cat_output .= get_cat_display_name_cache($category['uppercats']);
   }
   else
   {
     $cat_info = get_cat_info($category['category_id']);
-    $cat_output .= get_cat_display_name($cat_info['name'], ' → ');
+    $cat_output .= get_cat_display_name($cat_info['name']);
   }
   // the picture is commentable if it belongs at least to one category which