diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-06-04 08:09:15 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-06-04 08:09:15 +0200 |
| commit | 0353410cd4b8153fd2b6e9d3524c6e46ad4acd68 (patch) | |
| tree | e93cc7977a7367eb6281c733d9a34730dae3bf95 /include/datetime.php | |
| parent | 5de91c2a7c924ac6067828a0e5bfbef5572c1f39 (diff) | |
| parent | ca105f1c669950768a1f4cd6b93f471cabbc5114 (diff) | |
| download | volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.tar.gz volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.tar.bz2 volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.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])); } } }} |