rmdir was broken due to wrapper

cdujeu · cdujeu · commit 348d3d6d2a12 · 2015-09-22T17:57:57.000+02:00
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));
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,11 @@ public function rename($path_from, $path_to)`
`267`	`267`	`*/`
`268`	`268`	`public function rmdir($path, $options)`
`269`	`269`	`{`
`270`		`- return rmdir($this->translateScheme($path), $options);`
	`270`	`+ if(is_resource($options)){`
	`271`	`+ return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);`
	`272`	`+ }else{`
	`273`	`+ return rmdir(AJXP_MetaStreamWrapper::translateScheme($path));`
	`274`	`+ }`
`271`	`275`	`}`
`272`	`276`
`273`	`277`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,11 @@ public function rename($path_from, $path_to)`
`165`	`165`	`*/`
`166`	`166`	`public function rmdir($path, $options)`
`167`	`167`	`{`
`168`		`- return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);`
	`168`	`+ if(is_resource($options)){`
	`169`	`+ return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);`
	`170`	`+ }else{`
	`171`	`+ return rmdir(AJXP_MetaStreamWrapper::translateScheme($path));`
	`172`	`+ }`
`169`	`173`	`}`
`170`	`174`
`171`	`175`	`/**`