[Pkg-owncloud-commits] [owncloud] 234/394: use json encoding when deleting multiply files instead of using ; as delimiter

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit d8a596cb00e3e653406dabc9e2c4120d7a0bbf02
Author: Robin Appelman <icewind at owncloud.com>
Date:   Thu Dec 13 18:11:00 2012 +0100

    use json encoding when deleting multiply files instead of using ; as delimiter
---
 apps/files/ajax/delete.php |    2 +-
 apps/files/js/filelist.js  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 57c8c15..6532b76 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 43275e5..bfac2dd 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git