aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_calendar.inc.php
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2009-11-29 12:35:19 +0000
committernikrou <nikrou@piwigo.org>2009-11-29 12:35:19 +0000
commitc96097529e49943eddba78d70e23e38c0eac494d (patch)
tree5925d92bcad222348680a3ea6253d5743dbe38a4 /include/functions_calendar.inc.php
parent13ea9d50e35d9dd8cf7235a39d97a344e6091ea0 (diff)
Feature_1255 :
- single quotes in queries - start using $conf['dblayer'] git-svn-id: http://piwigo.org/svn/trunk@4385 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions_calendar.inc.php')
-rw-r--r--include/functions_calendar.inc.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/functions_calendar.inc.php b/include/functions_calendar.inc.php
index 74c366f8c..362c4cf14 100644
--- a/include/functions_calendar.inc.php
+++ b/include/functions_calendar.inc.php
@@ -258,7 +258,7 @@ WHERE id IN (' . implode(',',$page['items']) .')';
if ($must_show_list)
{
- $query = 'SELECT DISTINCT(id)';
+ $query = 'SELECT id';
$query .= $calendar->inner_sql.'
'.$calendar->get_date_where();
if ( isset($page['super_order_by']) )
@@ -284,9 +284,8 @@ WHERE id IN (' . implode(',',$page['items']) .')';
$query .= '
'.$order_by;
}
- $page['items'] = array_from_query($query, 'id');
+ $page['items'] = array_from_query($query, 'id');
}
pwg_debug('end initialize_calendar');
}
-
?> \ No newline at end of file