diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-11 20:25:59 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-11 20:25:59 -0400 |
| commit | 4bf13adff25f012c735931c0578b1f5d0790bdbe (patch) | |
| tree | a7c5451ff25e2f39936ae984ceb5b3b9eb519088 /lib/files.php | |
| parent | 88f4845ca33fd6f2988f230116e2190d15ab1866 (diff) | |
| parent | 8890a4128015df0ad57101703d6c164ea54fe4ee (diff) | |
| download | nextcloud-server-4bf13adff25f012c735931c0578b1f5d0790bdbe.tar.gz nextcloud-server-4bf13adff25f012c735931c0578b1f5d0790bdbe.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'lib/files.php')
| -rw-r--r-- | lib/files.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/files.php b/lib/files.php index 4f58ff6782d..f7a7aecc167 100644 --- a/lib/files.php +++ b/lib/files.php @@ -186,10 +186,12 @@ class OC_Files { * @param file $target */ public static function move($sourceDir,$source,$targetDir,$target){ - if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){ + if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared') && !OC_Filesystem::file_exists($targetDir.'/'.$target)){ $targetFile=self::normalizePath($targetDir.'/'.$target); $sourceFile=self::normalizePath($sourceDir.'/'.$source); return OC_Filesystem::rename($sourceFile,$targetFile); + } else { + return false; } } |