From 34538a62f4ac8bc6db41580058fdd040abaa3183 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Thu, 23 Feb 2006 02:30:19 +0000
Subject: new calendar completely integrated

git-svn-id: http://piwigo.org/svn/trunk@1051 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_calendar.inc.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'include/functions_calendar.inc.php')

diff --git a/include/functions_calendar.inc.php b/include/functions_calendar.inc.php
index a5a1e87bb..e39bbe2a0 100644
--- a/include/functions_calendar.inc.php
+++ b/include/functions_calendar.inc.php
@@ -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']);
-- 
cgit v1.2.3