Changeset 1163 for trunk/include/calendar_base.class.php

Timestamp:

Apr 14, 2006, 3:42:24 AM (18 years ago)

Author:

rvelices

Message:

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...)

File:

• trunk/include/calendar_base.class.php (modified) (2 diffs)

trunk/include/calendar_base.class.php

@@ -196 +196 @@
     }
 
-    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');
@@ -300 +301 @@
     for ($i=0; $i<count($page['chronology_date']); $i++)
     {
-      if ( 'any' === $page['chronology_date'] )
+      if ( 'any' === $page['chronology_date'][$i] )
       {
         $query .= ','.'"any"';