sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #875 from owncloud/multiplefiles_json 

use json when deleting multiply files instead of using ; as delimiter
remotes/origin/stable5
Bart Visscher 2012-12-14 16:26:09 +07:00
parent df7d6cb26c fda7d932ef
commit 6ff38624a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/ajax/delete.php
Unescape Escape View File

@ -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

2
apps/files/js/filelist.js
Unescape Escape View File

@ -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,