Merge pull request #3653 from terrafrost/branch-1

try copy / deleting folder if moving it doesn't work
Studio-42 · Sep 26, 2024 · 6c3ac22 · 6c3ac22
2 parents ef08b86 + 071b5ab
commit 6c3ac22
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php
@@ -5329,7 +5329,16 @@ protected function move($src, $dst, $name)
         $this->rmTmb($stat); // can not do rmTmb() after _move()
         $this->clearcache();
 
-        if ($res = $this->convEncOut($this->_move($this->convEncIn($src), $this->convEncIn($dst), $this->convEncIn($name)))) {
+        $res = $this->convEncOut($this->_move($this->convEncIn($src), $this->convEncIn($dst), $this->convEncIn($name)));
+        // if moving it didn't work try to copy / delete
+        if (!$res) {
+            $res = $this->copy($src, $dst, $name);
+            if (!$this->remove($src)) {
+                $res = false;
+            }
+        }
+
+        if ($res) {
             $this->clearstatcache();
             if ($stat['mime'] === 'directory') {
                 $this->updateSubdirsCache($dst, true);