From 6c7b53e0b6ee7fcd9c58570d999efa6d1bd158b8 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 6 Jul 2010 20:11:06 +0000 Subject: merge r6668 from trunk - removed function get_extra_fields and its usage (unnecessary + perf issue when retrieving many image ids in a section) - 2 fixes recent feed.php commit * month names were decalated by one * strptime function is not implemented under Windows in php - added somme missing $ROOT_URL in templates git-svn-id: http://piwigo.org/svn/branches/2.1@6669 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_calendar.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/functions_calendar.inc.php') diff --git a/include/functions_calendar.inc.php b/include/functions_calendar.inc.php index 5d0329e1d..990443b38 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 '.get_extra_fields($conf['order_by']); + $query = 'SELECT DISTINCT id '; $query .= ','.$calendar->date_field; $query .= $calendar->inner_sql.' '.$calendar->get_date_where(); -- cgit v1.2.3