aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/ajax
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-12-15 02:21:26 +0100
committerRobin Appelman <icewind@owncloud.com>2012-12-15 02:21:26 +0100
commit946d58eaa8f93eb612a277fad1d7f870554b578e (patch)
tree18ad2ac0c504eb283d70c040ce449b259d88f97f /apps/files/ajax
parent7969d6e64617235744889df42d0e671085a779a8 (diff)
parent6ff38624a717316d7992c81db6d4dbf8f5d86f3a (diff)
downloadnextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.tar.gz
nextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.zip
merge master into filesystem
Diffstat (limited to 'apps/files/ajax')
-rw-r--r--apps/files/ajax/delete.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index fdd0c0c491d..8f05eaaa1b8 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
$dir = stripslashes($_POST["dir"]);
$files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]);
-$files = explode(';', $files);
+$files = json_decode($files);
$filesWithError = '';
$success = true;