diff options
| author | zottel <github@zottel.net> | 2012-06-03 14:21:51 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-06-03 14:21:51 +0200 |
| commit | 70c4ab68754941749a5e89434d6db19f6bba1e16 (patch) | |
| tree | 525a6536b6ab7f9020e83daf9287c785303ad584 /include/datetime.php | |
| parent | df2fdf08ddf8cb354022992d4353ced4295b77b3 (diff) | |
| parent | daa4f5213f726b22846859f2f12d06889e9bdc9b (diff) | |
| download | volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.gz volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.bz2 volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/datetime.php')
| -rw-r--r-- | include/datetime.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/datetime.php b/include/datetime.php index f4dcfce62..3b1491e4d 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -244,7 +244,7 @@ function timesel($pre,$h,$m) { // Limited to range of timestamps if(! function_exists('relative_date')) { -function relative_date($posted_date) { +function relative_date($posted_date,$format = null) { $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); @@ -274,7 +274,9 @@ function relative_date($posted_date) { if ($d >= 1) { $r = round($d); // translators - e.g. 22 hours ago, 1 minute ago - return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1])); + if(! $format) + $format = t('%1$d %2$s ago'); + return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])); } } }} |