From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 13 Dec 2012 17:11:00 +0000 (+0100)
Subject: use json encoding when deleting multiply files instead of using ; as delimiter
X-Git-Tag: v5.0.0alpha1~320^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6a2b41e5e86cef9174b50f450aaf18097afe2f1c;p=nextcloud-server.git

use json encoding when deleting multiply files instead of using ; as delimiter
---

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,