[Pkg-owncloud-commits] [owncloud] 03/49: set delete all to true if a complete folder was deleted

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 1a197292da1e7955c2599591a672d24b5e0a3f4b
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon Dec 2 11:59:09 2013 +0100

    set delete all to true if a complete folder was deleted
---
 apps/files_trashbin/ajax/delete.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 7b1949e..7b41eb1 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -4,8 +4,8 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
 // "empty trash" command
-$deleteAll = false;
 if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true'){
+	$deleteAll = true;
 	$folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
 	if ($folder === '/') {
 		OCA\Files_Trashbin\Trashbin::deleteAll();
@@ -20,6 +20,7 @@ if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true'){
 	}
 }
 else {
+	$deleteAll = false;
 	$files = $_POST['files'];
 	$dirlisting = $_POST['dirlisting'];
 	$list = json_decode($files);

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