Skip to content

Z
z-push
Commit da5470ef authored by Sebastian Kummer's avatar Sebastian Kummer
Browse files
Options

Merge pull request #74 in ZP/z-push from... 

Merge pull request #74 in ZP/z-push from bugfix/ZP-732-nexus-5-android-6-sends-empty-data to develop

* commit '55a359c1':
  ZP-732 Accept empty <Data/> Tag.

(cherry picked from commit 87e0633d)
parent dbd365e0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/lib/request/sync.php
View file @ da5470ef
...@@ -427,7 +427,7 @@ class Sync extends RequestProcessor { ...@@ -427,7 +427,7 @@ class Sync extends RequestProcessor {
$clientid = false; $clientid = false;
// Get the SyncMessage if sent // Get the SyncMessage if sent
if(self::$decoder->getElementStartTag(SYNC_DATA)) { if(($el = self::$decoder->getElementStartTag(SYNC_DATA)) && ($el[EN_FLAGS] & EN_FLAGS_CONTENT)) {
$message = ZPush::getSyncObjectFromFolderClass($spa->GetContentClass()); $message = ZPush::getSyncObjectFromFolderClass($spa->GetContentClass());
$message->Decode(self::$decoder); $message->Decode(self::$decoder);
...@@ -1278,4 +1278,4 @@ class Sync extends RequestProcessor { ...@@ -1278,4 +1278,4 @@ class Sync extends RequestProcessor {
} }
} }
?> ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment