diff options
| -rw-r--r-- | include/category_cats.inc.php | 2 | ||||
| -rw-r--r-- | include/filter.inc.php | 2 | ||||
| -rw-r--r-- | include/functions_html.inc.php | 11 | ||||
| -rw-r--r-- | include/section_init.inc.php | 5 |
4 files changed, 14 insertions, 6 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index cfdd8db66..6e6304b94 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -39,7 +39,7 @@ SELECT date_last, max_date_last, count_images, count_categories, global_rank FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id = cat_id and user_id = '.$user['id'].' - WHERE date_last > SUBDATE( + WHERE date_last >= SUBDATE( CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY ) '.get_sql_condition_FandF diff --git a/include/filter.inc.php b/include/filter.inc.php index f373ca1cd..56617d9ec 100644 --- a/include/filter.inc.php +++ b/include/filter.inc.php @@ -95,7 +95,7 @@ WHERE '; category_id IN ('.$filter['visible_categories'].') and'; } $query.= ' - date_available > SUBDATE( + date_available >= SUBDATE( CURRENT_DATE,INTERVAL '.$filter['recent_period'].' DAY)'; $filter['visible_images'] = implode(',', array_from_query($query, 'image_id')); diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 5612454b0..43cf5d9e6 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -55,10 +55,17 @@ function get_icon($date, $is_child_date = false) return ''; } - $diff = time() - $unixtime; + if (!isset($page['get_icon_cache']['unix_timestamp'])) + { + // Use MySql date in order to standardize all recent "actions/queries" + list($page['get_icon_cache']['unix_timestamp']) = + mysql_fetch_array(pwg_query('select UNIX_TIMESTAMP(CURRENT_DATE)')); + } + + $diff = $page['get_icon_cache']['unix_timestamp'] - $unixtime; $day_in_seconds = 24*60*60; $page['get_icon_cache'][$date] = false; - if ( $diff < $user['recent_period'] * $day_in_seconds ) + if ( $diff <= $user['recent_period'] * $day_in_seconds ) { if ( !isset($page['get_icon_cache']['_icons_'] ) ) { diff --git a/include/section_init.inc.php b/include/section_init.inc.php index af633571a..672af0d5c 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -557,8 +557,9 @@ SELECT image_id SELECT DISTINCT(id) FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id - WHERE date_available > \''. - date('Y-m-d', time() - 60*60*24*$user['recent_period']).'\' + WHERE + date_available >= SUBDATE( + CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY) '.$forbidden.' '.$conf['order_by'].' ;'; |