new calendar completely integrated

git-svn-id: http://piwigo.org/svn/trunk@1051 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-02-23 02:30:19 +00:00
parent fe8fbac3cf
commit 34538a62f4
8 changed files with 128 additions and 620 deletions
+13
View File
@@ -231,6 +231,19 @@ WHERE id IN (' . implode(',',$page['items']) .')';
$query = 'SELECT DISTINCT(id)';
$query .= $calendar->inner_sql;
$query .= $calendar->get_date_where($requested);
if ( isset($page['super_order_by']) )
{
$query .= '
'.$conf['order_by'];
}
else
{
$order_by = str_replace(
'ORDER BY ',
'ORDER BY '.$calendar->date_field.',', $conf['order_by']
);
$query .= $order_by;
}
$page['items'] = array_from_query($query, 'id');
$page['cat_nb_images'] = count($page['items']);