rmdir was broken due to wrapper

pydio · Sep 22, 2015 · 348d3d6 · 348d3d6
1 parent 19de341
commit 348d3d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/core/src/core/classes/class.AJXP_MetaStreamWrapper.php b/core/src/core/classes/class.AJXP_MetaStreamWrapper.php
@@ -267,7 +267,11 @@ public function rename($path_from, $path_to)
      */
     public function rmdir($path, $options)
     {
-        return rmdir($this->translateScheme($path), $options);
+        if(is_resource($options)){
+            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);
+        }else{
+            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path));
+        }
     }
 
     /**

diff --git a/core/src/core/classes/class.AJXP_SchemeTranslatorWrapper.php b/core/src/core/classes/class.AJXP_SchemeTranslatorWrapper.php
@@ -165,7 +165,11 @@ public function rename($path_from, $path_to)
      */
     public function rmdir($path, $options)
     {
-        return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);
+        if(is_resource($options)){
+            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);
+        }else{
+            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path));
+        }
     }
 
     /**