diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-13 18:11:00 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-13 18:11:00 +0100 |
| commit | 6a2b41e5e86cef9174b50f450aaf18097afe2f1c (patch) | |
| tree | 6422bde99980041a71332033d156d12b24990e80 /apps | |
| parent | 77c16b293377d40668dd8aa7af1fe93757dc8d46 (diff) | |
| download | nextcloud-server-6a2b41e5e86cef9174b50f450aaf18097afe2f1c.tar.gz nextcloud-server-6a2b41e5e86cef9174b50f450aaf18097afe2f1c.zip | |
use json encoding when deleting multiply files instead of using ; as delimiter
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/ajax/delete.php | 2 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 1 |
2 files changed, 2 insertions, 1 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..3fbafd722b5 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -289,6 +289,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, |