diff options
author | rvelices <rv-github@modusoptimus.com> | 2010-07-06 20:10:03 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2010-07-06 20:10:03 +0000 |
commit | 4748adc3f5cb4a3ef2cddb31db73ecd2e6b68bb8 (patch) | |
tree | 547d5061d98069e1bc487358db59b532edf41711 /include/functions_notification.inc.php | |
parent | 804d79a625aacaac774832c1ea5230c996bb57f1 (diff) |
- 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/trunk@6668 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | include/functions_notification.inc.php | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php index ebb713fb6..363ea7e58 100644 --- a/include/functions_notification.inc.php +++ b/include/functions_notification.inc.php @@ -79,7 +79,7 @@ function custom_notification_query($action, $type, $start, $end) } if (!empty($end)) { - $query .= ' + $query .= ' AND c.validation_date <= \''.$end.'\''; } $query .= get_std_sql_where_restrict_filter('AND').' @@ -94,7 +94,7 @@ function custom_notification_query($action, $type, $start, $end) $query .= ' AND date> \''.$start.'\''; } if (!empty($end)) - { + { $query .= ' AND date <= \''.$end.'\''; } $query .= ' AND validated = \'false\' @@ -619,9 +619,20 @@ function get_title_recent_post_date($date_detail) $exploded_date = strptime($date, '%Y-%m-%d %H:%M:%S'); $title = l10n_dec('%d new image', '%d new images', $date_detail['nb_elements']); - $title .= ' ('.$lang['month'][(int)$exploded_date['tm_mon']].' '.$exploded_date['tm_mday'].')'; + $title .= ' ('.$lang['month'][1+$exploded_date['tm_mon']].' '.$exploded_date['tm_mday'].')'; return $title; } +if(!function_exists("strptime")) +{ + function strptime($date, $fmt) + { + if ($fmt != '%Y-%m-%d %H:%M:%S') + die('Invalid strptime format '.$fmt); + list($y,$m,$d,$H,$M,$S) = preg_split('/[-: ]/', $date); + $res = localtime( mktime($H,$M,$S,$m,$d,$y), true ); + return $res; + } + } ?>
\ No newline at end of file |