Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index 626e0b92c47c90411f3813d8d8512bfab03184a0..e88c274ab967449649311a592171af1f7be4a9a8 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -325,7 +325,7 @@ 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
  *
@@ -361,11 +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]));
                }
        }
 }
@@ -552,7 +552,7 @@ function update_contact_birthdays() {
        // In-network birthdays are handled within local_delivery
 
        $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` ");
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
 
                        logger('update_contact_birthday: ' . $rr['bd']);