adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 00:23:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r1162 from branch-1_6 into trunk

Browse Source 
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
This commit is contained in:
rvelices
2006-04-14 01:42:24 +00:00
parent 5acf171662
commit 16e8f48477
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/calendar_base.class.php
+3 -2
View File
@@ -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"';
}