summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files_trashbin/ajax/delete.php6
-rw-r--r--apps/files_trashbin/ajax/undelete.php2
-rw-r--r--apps/files_trashbin/js/trash.js4
3 files changed, 4 insertions, 8 deletions
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 915ad9379f6..80382147eb7 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -5,11 +5,7 @@ OCP\JSON::callCheck();
$files = $_POST['files'];
$dirlisting = $_POST['dirlisting'];
-$list = explode(';', $files);
-
-if (!is_array($list)){
- $list = array($list);
-}
+$list = explode('|', $files);
$error = array();
$success = array();
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 57f62816749..b76adb2a2a7 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -5,7 +5,7 @@ OCP\JSON::callCheck();
$files = $_POST['files'];
$dirlisting = $_POST['dirlisting'];
-$list = explode(';', $files);
+$list = explode('|', $files);
$error = array();
$success = array();
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index fc38889dc37..c8b862837a6 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -93,7 +93,7 @@ $(document).ready(function() {
$('.undelete').click('click',function(event) {
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
var files=getSelectedFiles('file');
- var fileslist=files.join(';');
+ var fileslist=files.join('|');
var dirlisting=getSelectedFiles('dirlisting')[0];
for (var i in files) {
@@ -118,7 +118,7 @@ $(document).ready(function() {
console.log("delete selected");
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files=getSelectedFiles('file');
- var fileslist=files.join(';');
+ var fileslist=files.join('|');
var dirlisting=getSelectedFiles('dirlisting')[0];
for (var i in files) {