ZP-1260 Improve isset in ASDevice->GetFolderSyncStatus().

Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1260 Improve isset in ASDevice->GetFolderSyncStatus().
Released under the Affero GNU General Public License (AGPL) version 3.
f7241e29 · Manfred Kutas · 1a9be5c8 · f7241e29
Commit f7241e29 authored Aug 03, 2017 by Manfred Kutas
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

asdevice.php src/lib/core/asdevice.php +3 -3

No files found.
--- a/src/lib/core/asdevice.php
+++ b/src/lib/core/asdevice.php
@@ -775,11 +775,11 @@ class ASDevice extends StateObject {
     * @return mixed/boolean        false means the status is not available
     */
    public function GetFolderSyncStatus($folderid) {
-        if (isset($this->contentData) && isset($this->contentData[$folderid]) &&
+        if (isset($this->contentData[$folderid][self::FOLDERUUID], $this->contentData[$folderid][self::FOLDERSYNCSTATUS]) &&
-            isset($this->contentData[$folderid][self::FOLDERUUID]) && $this->contentData[$folderid][self::FOLDERUUID] !== false &&
+                $this->contentData[$folderid][self::FOLDERUUID] !== false) {
-            isset($this->contentData[$folderid][self::FOLDERSYNCSTATUS]) )
            return $this->contentData[$folderid][self::FOLDERSYNCSTATUS];
+        }
        return false;
    }