ZP-1254 Wastebasket not available when removing an item in public

folder.

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

src/backend/kopano/kopano.php

@@ -711,7 +711,7 @@ class BackendKopano implements IBackend, ISearchProvider {
 
         $storeprops = mapi_getprops($this->defaultstore, array(PR_IPM_WASTEBASKET_ENTRYID));
         if (isset($storeprops[PR_IPM_WASTEBASKET_ENTRYID])) {
-            $wastebasket = mapi_msgstore_openentry($this->store, $storeprops[PR_IPM_WASTEBASKET_ENTRYID]);
+            $wastebasket = mapi_msgstore_openentry($this->defaultstore, $storeprops[PR_IPM_WASTEBASKET_ENTRYID]);
             $wastebasketprops = mapi_getprops($wastebasket, array(PR_SOURCE_KEY));
             if (isset($wastebasketprops[PR_SOURCE_KEY])) {
                 $this->wastebasket = bin2hex($wastebasketprops[PR_SOURCE_KEY]);

src/lib/core/asdevice.php

@@ -188,7 +188,7 @@ class ASDevice extends StateObject {
         unset($this->forceSave);
         unset($this->newdevice);
         unset($this->ignoredMessageIds);
-        unset($this->backend2folderidCache);
+        $this->backend2folderidCache = false;
 
         if (isset($this->ignoredmessages) && is_array($this->ignoredmessages)) {
             $imessages = $this->ignoredmessages;