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

Merge pull request #373 in ZP/z-push from feature/ZP-1050-indicate-short-folder-ids-in-webservice to develop

* commit '0c9ef4f9':
  ZP-1050 The returned data contains a "hasFolderIdMapping" flag now.

src/lib/utils/zpushadmin.php

@@ -121,6 +121,9 @@ class ZPushAdmin {
                 // get information about the folder synchronization status from SyncCollections
                 $folders = $device->GetAllFolderIds();
 
+                // indicate short folderids
+                $device->hasFolderIdMapping = $device->HasFolderIdMapping();
+
                 foreach ($folders as $folderid) {
                     $fstatus = $device->GetFolderSyncStatus($folderid);