aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-29 03:54:29 -0700
committerFriendika <info@friendika.com>2011-06-29 03:54:29 -0700
commitbaead9f4c83564e9b6d8c87f62a377ee1226a149 (patch)
treeed47e30429f3175816df4440f36092791e730703
parent26cd3a47036b860d1ec8a42b69116ac41500e522 (diff)
downloadvolse-hubzilla-baead9f4c83564e9b6d8c87f62a377ee1226a149.tar.gz
volse-hubzilla-baead9f4c83564e9b6d8c87f62a377ee1226a149.tar.bz2
volse-hubzilla-baead9f4c83564e9b6d8c87f62a377ee1226a149.zip
very minor nit - if $abs is false, return before trying to use false in a numeric calculation
also return 'never' if we have an uninitialised date
-rw-r--r--include/datetime.php21
1 files changed, 11 insertions, 10 deletions
diff --git a/include/datetime.php b/include/datetime.php
index ade202cad..8c30cf4b7 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -65,9 +65,9 @@ if(! function_exists('datetime_convert')) {
function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
- // otherwise we end up with -0001-11-30 ...
+ // otherwise we end up with -0001-11-30 ...
// add 32 days so that we at least get year 00, and then hack around the fact that
- // months and days always start with 1.
+ // months and days always start with 1.
if(substr($s,0,10) == '0000-00-00') {
$d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
@@ -176,23 +176,24 @@ function relative_date($posted_date) {
$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
$abs = strtotime($localtime);
- $etime = time() - $abs;
- if ($abs==False) {
+ if ($posted_date === '0000-00-00 00:00:00' || $abs === False) {
return t('never');
}
+
+ $etime = time() - $abs;
if ($etime < 1) {
return t('less than a second ago');
}
$a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')),
- 30 * 24 * 60 * 60 => array( t('month'), t('months')),
- 7 * 24 * 60 * 60 => array( t('week'), t('weeks')),
- 24 * 60 * 60 => array( t('day'), t('days')),
- 60 * 60 => array( t('hour'), t('hours')),
- 60 => array( t('minute'), t('minutes')),
- 1 => array( t('second'), t('seconds'))
+ 30 * 24 * 60 * 60 => array( t('month'), t('months')),
+ 7 * 24 * 60 * 60 => array( t('week'), t('weeks')),
+ 24 * 60 * 60 => array( t('day'), t('days')),
+ 60 * 60 => array( t('hour'), t('hours')),
+ 60 => array( t('minute'), t('minutes')),
+ 1 => array( t('second'), t('seconds'))
);
foreach ($a as $secs => $str) {