diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
| commit | 598a2563e844477de2f688663c7c46962b26b602 (patch) | |
| tree | 525a6536b6ab7f9020e83daf9287c785303ad584 /include/datetime.php | |
| parent | 8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6 (diff) | |
| parent | daa4f5213f726b22846859f2f12d06889e9bdc9b (diff) | |
| download | volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.gz volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.bz2 volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* 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])); } } }} |