From 6a2b41e5e86cef9174b50f450aaf18097afe2f1c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 13 Dec 2012 18:11:00 +0100
Subject: [PATCH] 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 57c8c15c19..6532b76df2 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 9f0bafafbd..3fbafd722b 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,
--
GitLab