Merge pull request #124 from ParsePlatform/gFosco.pushUTC

Updated push handling for local or non-local time push.
parse-community · Jun 16, 2015 · 3b1b267 · 3b1b267 · siberex · Sep 15, 2015
2 parents db08502 + 4ede7f1
commit 3b1b267
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Parse/ParseClient.php b/src/Parse/ParseClient.php
@@ -405,12 +405,14 @@ public static function getProperDateFormat($value)
      * Format from Parse doc: an ISO 8601 date without a time zone, i.e. 2014-10-16T12:00:00 .
      *
      * @param \DateTime $value DateTime value to format.
+     * @param boolean $local Whether to return the local push time
      *
      * @return string
      */
-    public static function getLocalPushDateFormat($value)
+    public static function getPushDateFormat($value, $local = false)
     {
         $dateFormatString = 'Y-m-d\TH:i:s';
+        if (!$local) $dateFormatString .= '\Z';
         $date = date_format($value, $dateFormatString);
 
         return $date;

diff --git a/src/Parse/ParsePush.php b/src/Parse/ParsePush.php
@@ -49,7 +49,7 @@ public static function send($data, $useMasterKey = false)
         if (isset($data['push_time'])) {
             //Local push date format is different from iso format generally used in Parse
             //Schedule does not work if date format not correct
-            $data['push_time'] = ParseClient::getLocalPushDateFormat($data['push_time']);
+            $data['push_time'] = ParseClient::getPushDateFormat($data['push_time'], isset($data['local_time']));
         }
         if (isset($data['expiration_time'])) {
             $data['expiration_time'] = ParseClient::_encode(