diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-12-14 16:26:09 -0800 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-12-14 16:26:09 -0800 |
| commit | 6ff38624a717316d7992c81db6d4dbf8f5d86f3a (patch) | |
| tree | ff71b809c3e4b6e404890174916ad7e1072cd3ee /apps | |
| parent | df7d6cb26c0e54e9df509b4a739b4d41c87fcb98 (diff) | |
| parent | fda7d932efbb95c28b8fe61f355c9d8cc4390862 (diff) | |
| download | nextcloud-server-6ff38624a717316d7992c81db6d4dbf8f5d86f3a.tar.gz nextcloud-server-6ff38624a717316d7992c81db6d4dbf8f5d86f3a.zip | |
Merge pull request #875 from owncloud/multiplefiles_json
use json 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 | 2 |
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, |