Merge pull request #2946 from annando/1611-bugfix-groups

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index ea98f01fe0999e63bc45400470f76c6fdb2c9a25..16b134e90b13d8525fdfd3535f3694bb451ade2e 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -325,15 +325,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
  * Results relative to current timezone.
  * Limited to range of timestamps.
  *
- * @param string $posted_date
+ * @param string $posted_date MySQL-formatted date string (YYYY-MM-DD HH:MM:SS)
  * @param string $format (optional) Parsed with sprintf()
  *    <tt>%1$d %2$s ago</tt>, e.g. 22 hours ago, 1 minute ago
- * 
+ *
  * @return string with relative date
  */
-function relative_date($posted_date,$format = null) {
+function relative_date($posted_date, $format = null) {
 
-       $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
+       $localtime = $posted_date . ' UTC';
 
        $abs = strtotime($localtime);
 
@@ -347,13 +347,6 @@ function relative_date($posted_date,$format = null) {
                return t('less than a second ago');
        }
 
-       /*
-       $time_append = '';
-       if ($etime >= 86400) {
-               $time_append = ' ('.$localtime.')';
-       }
-       */
-
        $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')),
@@ -368,10 +361,11 @@ function relative_date($posted_date,$format = null) {
                if ($d >= 1) {
                        $r = round($d);
                        // translators - e.g. 22 hours ago, 1 minute ago
-                       if(! $format)
+                       if (!$format) {
                                $format = t('%1$d %2$s ago');
+                       }
 
-                       return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
+                       return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1]));
                }
        }
 }