Feature 511 : fix problems with calendar functions

add pwg_db_concat() function

git-svn-id: http://piwigo.org/svn/trunk@4833 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2010-02-03 09:26:32 +00:00
parent 7fda6e5af9
commit e1de0d6faf
8 changed files with 75 additions and 25 deletions
+4 -2
View File
@@ -220,6 +220,7 @@ $this->get_date_where($level).'
;';
$level_items = simple_hash_from_query($query, 'period', 'nb_images');
$level_items = array_to_int($level_items);
if ( count($level_items)==1 and
count($page['chronology_date'])<count($this->calendar_levels)-1)
@@ -291,13 +292,14 @@ GROUP BY period';
$current = implode('-', $page['chronology_date'] );
$upper_items = array_from_query( $query, 'period');
$upper_items = array_to_int($upper_items);
usort($upper_items, 'date_compare');
usort($upper_items, 'version_compare');
$upper_items_rank = array_flip($upper_items);
if ( !isset($upper_items_rank[$current]) )
{
array_push($upper_items, $current);// just in case (external link)
usort($upper_items, 'date_compare');
usort($upper_items, 'version_compare');
$upper_items_rank = array_flip($upper_items);
}
$current_rank = $upper_items_rank[$current];