Exit after using the shortcut to copy files on the same backend.

horde · Nov 5, 2015 · 1090f9f · 1090f9f
1 parent c899af7
commit 1090f9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/gollem/docs/CHANGES b/gollem/docs/CHANGES
@@ -2,6 +2,7 @@
 v3.0.7-git
 ----------
 
+[jan] Fix fatal error when cutting and pasting files on the same backend.
 
 
 ------

diff --git a/gollem/lib/Gollem.php b/gollem/lib/Gollem.php
@@ -524,6 +524,7 @@ static protected function _copyFile($mode, $backend_f, $dir, $name,
             } catch (Horde_Vfs_Exception $e) {
                 throw new Gollem_Exception($e);
             }
+            return;
         }
 
         /* Else, get the two VFS objects and copy/move the files. */

diff --git a/gollem/package.xml b/gollem/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [jan] Fix fatal error when cutting and pasting files on the same backend.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -870,7 +870,7 @@
    <date>2015-10-20</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [jan] Fix fatal error when cutting and pasting files on the same backend.
    </notes>
   </release>
  </changelog>