aboutsummaryrefslogtreecommitdiffstats
path: root/include/category_calendar.inc.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2004-12-12 21:06:39 +0000
committerplegall <plg@piwigo.org>2004-12-12 21:06:39 +0000
commit391fac78a80c9317e764a13d742c88d8fe0866fc (patch)
tree178c3f72dd0356c4c6ad05adae9d974dedbfa506 /include/category_calendar.inc.php
parent9037726f5a658dc156ef444f2d90271ee2102711 (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 'include/category_calendar.inc.php')
-rw-r--r--include/category_calendar.inc.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php
index b318c7c25..e718928ce 100644
--- a/include/category_calendar.inc.php
+++ b/include/category_calendar.inc.php
@@ -363,6 +363,8 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path
}
elseif (isset($page['calendar_day']))
{
+ $old_level_separator = $conf['level_separator'];
+ $conf['level_separator'] = '<br />';
// for each category of this day, display a random picture
foreach ($calendar_categories as $calendar_category => $nb_pics)
{
@@ -373,7 +375,8 @@ elseif (isset($page['calendar_day']))
else
{
$cat_infos = get_cat_info( $calendar_category );
- $name = get_cat_display_name($cat_infos['name'],'<br />','',false);
+
+ $name = get_cat_display_name($cat_infos['name'],'',false);
$name = '['.$name.']';
}
$name.= ' ('.$nb_pics.')';
@@ -426,5 +429,6 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path
$row_number = 0;
}
}
+ $conf['level_separator'] = $old_level_separator;
}
?> \ No newline at end of file