diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-13 18:11:00 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-15 02:12:13 +0100 |
| commit | d8a596cb00e3e653406dabc9e2c4120d7a0bbf02 (patch) | |
| tree | 523536e78cd6747263c9f4b6d13ad6d11d3ff39b | |
| parent | ca6aa13b4052931093e6ba185a899402dfe6bca0 (diff) | |
| download | nextcloud-server-d8a596cb00e3e653406dabc9e2c4120d7a0bbf02.tar.gz nextcloud-server-d8a596cb00e3e653406dabc9e2c4120d7a0bbf02.zip | |
use json encoding when deleting multiply files instead of using ; as delimiter
| -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 43275e5d3a9..bfac2dd8003 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -287,6 +287,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, |