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

Merge pull request #201 in ZP/z-push from bugfix/ZP-855-searched-and-found-message-can-not to develop

* commit 'b0221f6c':
  ZP-855 Searched and found message can not be deleted (iOS).

src/backend/zarafa/zarafa.php

@@ -1208,7 +1208,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
         $items["range"] = $cpo->GetSearchRange();
         for ($i = 0; $i < $cnt; $i++) {
             $items[$i]['class'] = 'Email';
-            $items[$i]['longid'] = bin2hex($rows[$i][PR_PARENT_SOURCE_KEY]) . ":" . bin2hex($rows[$i][PR_SOURCE_KEY]);
+            $items[$i]['longid'] = ZPush::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($rows[$i][PR_PARENT_SOURCE_KEY])) . ":" . bin2hex($rows[$i][PR_SOURCE_KEY]);
             $items[$i]['folderid'] = bin2hex($rows[$i][PR_PARENT_SOURCE_KEY]);
         }
         return $items;

src/lib/request/itemoperations.php

@@ -293,7 +293,7 @@ class ItemOperations extends RequestProcessor {
                         else if (isset($operation['longid'])) {
                             self::$topCollector->AnnounceInformation("Fetching data from backend with long id");
                             $tmp = explode(":", $operation['longid']);
-                            $data = self::$backend->Fetch($tmp[0], $tmp[1], $operation["cpo"]);
+                            $data = self::$backend->Fetch(self::$deviceManager->GetBackendIdForFolderId($tmp[0]), $tmp[1], $operation["cpo"]);
                         }
                     }
                     catch (StatusException $stex) {