diff options
| -rw-r--r-- | include/category_calendar.inc.php | 9 | ||||
| -rw-r--r-- | include/functions_category.inc.php | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php index a355a9339..f4eb87359 100644 --- a/include/category_calendar.inc.php +++ b/include/category_calendar.inc.php @@ -187,7 +187,8 @@ elseif (isset($page['calendar_day'])) SELECT category_id AS category, COUNT(id) AS count FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id '.$page['where'].' - AND '.$conf['calendar_datefield'].' = \''.$page['calendar_date'].'\' + AND DATE_FORMAT('.$conf['calendar_datefield'].', \'%Y-%c-%e\')' + .' = \''.$page['calendar_date'].'\' GROUP BY category_id ;'; $result = pwg_query($query); @@ -337,7 +338,8 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path , DAYOFWEEK(\''.$calendar_day.'\') AS dow FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id '.$page['where'].' - AND '.$conf['calendar_datefield'].' = \''.$calendar_day.'\' + AND DATE_FORMAT('.$conf['calendar_datefield'].', \'%Y-%m-%d\')' + .' = \''.$calendar_day.'\' ORDER BY RAND() LIMIT 0,1 ;'; @@ -405,7 +407,8 @@ elseif (isset($page['calendar_day'])) SELECT file,tn_ext,'.$conf['calendar_datefield'].',path FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.' '.$page['where'].' - AND '.$conf['calendar_datefield'].' = \''.$page['calendar_date'].'\''; + AND DATE_FORMAT('.$conf['calendar_datefield'].', \'%Y-%c-%e\')' + .' = \''.$page['calendar_date'].'\''; if ($calendar_category != 0) { $query.= ' diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index ad118a905..fc2bb3c25 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -487,7 +487,7 @@ function initialize_category( $calling_page = 'category' ) $key = $datefield; if (isset($search['fields'][$key])) { - $local_clause = $datefield." = '"; + $local_clause = 'DATE_FORMAT('.$datefield.", '%Y-%m-%d') = '"; $local_clause.= str_replace('.', '-', $search['fields'][$key]['words'][0]); $local_clause.= "'"; |