aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/ajax/delete.php2
-rw-r--r--apps/files/js/filelist.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 57c8c15c197..6532b76df21 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;
//Now delete
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 9f0bafafbdf..96dd0323d29 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -288,7 +288,7 @@ var FileList={
},
finishDelete:function(ready,sync){
if(!FileList.deleteCanceled && FileList.deleteFiles){
- var fileNames=FileList.deleteFiles.join(';');
+ var fileNames=JSON.stringify(FileList.deleteFiles);
$.ajax({
url: OC.filePath('files', 'ajax', 'delete.php'),
async:!sync,