Fix IMAP access driver that was failing if cache was enabled.

pydio · Nov 21, 2016 · 442478d · 442478d
1 parent c61b46c
commit 442478d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/core/src/plugins/access.imap/ImapAccessDriver.php b/core/src/plugins/access.imap/ImapAccessDriver.php
@@ -218,11 +218,16 @@ public function countChildren(AJXP_Node $dirNode, $foldersOnly = false, $nonEmpt
     {
         if($foldersOnly) return 0;
         $count = 0;
-        if($tmpHandle = opendir($dirNode->getUrl())){
+        if($dirHANDLE !== null){
+            $tmpHandle = $dirHANDLE;
+        }else{
+            $tmpHandle = opendir($dirNode->getUrl());
+        }
+        if($tmpHandle !== false){
             // WILL USE IMAP FUNCTIONS TO COUNT;
             $this->logDebug("COUNT : ".ImapAccessWrapper::getCurrentDirCount());
             $count = ImapAccessWrapper::getCurrentDirCount();
-            closedir($tmpHandle);
+            //closedir($tmpHandle);
         }
         return $count;
     }

diff --git a/core/src/plugins/editor.eml/manifest.xml b/core/src/plugins/editor.eml/manifest.xml
@@ -62,7 +62,7 @@
 			</action>
 		</actions>
 		<hooks>
-			<serverCallback hookName="node.info" methodName="extractMimeHeaders"/>
+			<serverCallback hookName="node.info.nocache" methodName="extractMimeHeaders"/>
 		</hooks>
 	</registry_contributions>
 	<dependencies>