From: Evan Prodromou <evan@status.net>
Date: Thu, 16 Sep 2010 03:31:20 +0000 (-0400)
Subject: Merge branch '0.9.x' into activityexport
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=670ad53215eaaa40a55a1977b373a62940c50a42;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into activityexport
---

670ad53215eaaa40a55a1977b373a62940c50a42
diff --cc lib/activity.php
index d3c725e630,09a4daee82..f19f10e34d
--- a/lib/activity.php
+++ b/lib/activity.php
@@@ -388,13 -386,4 +388,12 @@@ class Activit
      {
          return ActivityUtils::child($element, $tag, $namespace);
      }
 +
 +    static function iso8601Date($tm)
 +    {
 +        $dateStr = date('d F Y H:i:s', $tm);
 +        $d = new DateTime($dateStr, new DateTimeZone('UTC'));
 +        $d->setTimezone(new DateTimeZone(common_timezone()));
 +        return $d->format('c');
 +    }
  }
-