diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-03-06 11:55:45 +0100 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-03-06 11:55:45 +0100 |
| commit | eb5265b1065c4978028c34ee7b77aff137c51c9f (patch) | |
| tree | 8448dbbf0eecb87746cfc23ee8ecd1389295fa89 /apps/files/ajax/move.php | |
| parent | dbf83aada2f8dae509d17b947ecce6a4d09f8174 (diff) | |
| parent | 1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a (diff) | |
| download | nextcloud-server-eb5265b1065c4978028c34ee7b77aff137c51c9f.tar.gz nextcloud-server-eb5265b1065c4978028c34ee7b77aff137c51c9f.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/ajax/move.php')
| -rw-r--r-- | apps/files/ajax/move.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 93063e52eb0..04a260265c2 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -18,7 +18,7 @@ if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) { exit; } -if ($dir != '' || $file != 'Shared') { +if ($target != '' || strtolower($file) != 'shared') { $targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file); $sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file); if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) { |