diff options
| author | plegall <plg@piwigo.org> | 2004-12-12 21:06:39 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2004-12-12 21:06:39 +0000 |
| commit | 391fac78a80c9317e764a13d742c88d8fe0866fc (patch) | |
| tree | 178c3f72dd0356c4c6ad05adae9d974dedbfa506 /picture.php | |
| parent | 9037726f5a658dc156ef444f2d90271ee2102711 (diff) | |
- 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
Diffstat (limited to '')
| -rw-r--r-- | picture.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/picture.php b/picture.php index 570bf6dc4..a85f55b64 100644 --- a/picture.php +++ b/picture.php @@ -348,7 +348,12 @@ if ( isset( $_POST['content'] ) && !empty($_POST['content']) ) // notification to the administrators 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']); } @@ -389,7 +394,7 @@ $title_img = $picture['current']['name']; $title_nb = ''; 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,6 +448,8 @@ $template->assign_vars(array( 'WIDTH_IMG' => $picture_size[0], 'HEIGHT_IMG' => $picture_size[1], + 'LEVEL_SEPARATOR' => $conf['level_separator'], + 'L_HOME' => $lang['home'], 'L_SLIDESHOW' => $lang['slideshow'], 'L_STOP_SLIDESHOW' => $lang['slideshow_stop'], @@ -768,13 +775,12 @@ foreach ($cat_array as $category) 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 // is commentable |