Commit e2884686 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1071 Don't warn if the folder origin can not be determined for an

unmapped folderid.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 3e21a96f
...@@ -500,7 +500,7 @@ class ZPushAdmin { ...@@ -500,7 +500,7 @@ class ZPushAdmin {
foreach ($device->GetAdditionalFolders() as $folder) { foreach ($device->GetAdditionalFolders() as $folder) {
$syncfolderid = $device->GetFolderIdForBackendId($folder['folderid'], false, false, null); $syncfolderid = $device->GetFolderIdForBackendId($folder['folderid'], false, false, null);
$folder['syncfolderid'] = $syncfolderid; $folder['syncfolderid'] = $syncfolderid;
$folder['origin'] = Utils::GetFolderOriginStringFromId($syncfolderid); $folder['origin'] = ($syncfolderid !== $folder['folderid'])?Utils::GetFolderOriginStringFromId($syncfolderid):'unknown';
$new_list[$folder['folderid']] = $folder; $new_list[$folder['folderid']] = $folder;
} }
foreach (ZPush::GetAdditionalSyncFolders() as $fid => $so) { foreach (ZPush::GetAdditionalSyncFolders() as $fid => $so) {
...@@ -513,7 +513,7 @@ class ZPushAdmin { ...@@ -513,7 +513,7 @@ class ZPushAdmin {
'syncfolderid' => $syncfolderid, 'syncfolderid' => $syncfolderid,
'name' => $so->displayname, 'name' => $so->displayname,
'type' => $so->type, 'type' => $so->type,
'origin' => Utils::GetFolderOriginStringFromId($syncfolderid), 'origin' => ($syncfolderid !== $fid)?Utils::GetFolderOriginStringFromId($syncfolderid):'unknown',
'flags' => 0, // static folders have no flags 'flags' => 0, // static folders have no flags
); );
} }
......
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