diff options
| author | rvelices <rv-github@modusoptimus.com> | 2006-04-14 01:42:24 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2006-04-14 01:42:24 +0000 |
| commit | 16e8f48477e8d6b555f633dd0bf421e94fc18f24 (patch) | |
| tree | 0b412b3025d2edc7ecbe7a6af2e0b15b4b6180a7 /include/calendar_base.class.php | |
| parent | 5acf1716620f432aa25cde0b50aa0490fe87f7f1 (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | include/calendar_base.class.php | 5 |
1 files changed, 3 insertions, 2 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.= '</span>'; } - 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)<count($this->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; $i<count($page['chronology_date']); $i++) { - if ( 'any' === $page['chronology_date'] ) + if ( 'any' === $page['chronology_date'][$i] ) { $query .= ','.'"any"'; } |