diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
| commit | 1147dc977422e827a201fa081abd07721231d072 (patch) | |
| tree | 203d47297c49545a67bbdd98cbe137b255a5d6d8 /apps/files/ajax/move.php | |
| parent | 88b91a7304f2de998f71a674f4f62e85f5b83e54 (diff) | |
| parent | 135680e50bf760d55a1bcaaaa02f959bde396c52 (diff) | |
| download | nextcloud-server-1147dc977422e827a201fa081abd07721231d072.tar.gz nextcloud-server-1147dc977422e827a201fa081abd07721231d072.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
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 0541bb16062..5612716b7e4 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -12,7 +12,7 @@ $file = stripslashes($_GET["file"]); $target = stripslashes(rawurldecode($_GET["target"])); -if(OC_Filesystem::file_exists($target . '/' . $file)){ +if(OC_Filesystem::file_exists($target . '/' . $file)) { OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" ))); exit; } |