From 16e8f48477e8d6b555f633dd0bf421e94fc18f24 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 14 Apr 2006 01:42:24 +0000 Subject: merge r1162 from branch-1_6 into trunk fix: calendar prev/next links not working properly when 'any' (All/Tout) was selected fix: calendar 'any' (All/Tout) not shown on for the day selection (last calendar level) - it was meaningless fix: calendar image ordering is by date descending for large periods (no year selected) or ascending for small periods (week,month...) git-svn-id: http://piwigo.org/svn/trunk@1163 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/calendar_base.class.php | 5 +++-- include/functions_calendar.inc.php | 11 ++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/calendar_base.class.php b/include/calendar_base.class.php index 7a1356db8..a88c36dcd 100644 --- a/include/calendar_base.class.php +++ b/include/calendar_base.class.php @@ -195,7 +195,8 @@ class CalendarBase $nav_bar.= ''; } - if ($conf['calendar_show_any'] and $show_any and count($items) > 1) + if ($conf['calendar_show_any'] and $show_any and count($items)>1 and + count($date_components)calendar_levels)-1 ) { $label = l10n('calendar_any'); if (isset($selected_item) and 'any' === $selected_item) @@ -299,7 +300,7 @@ SELECT DISTINCT('.$this->calendar_levels[$level]['sql'] $query = 'SELECT CONCAT_WS("-"'; for ($i=0; $idate_field.' DESC,', $conf['order_by'] + 'ORDER BY '.$calendar->date_field.$order, $conf['order_by'] ); $query .= ' '.$order_by; -- cgit v1.2.3