From: Björn Schießle <schiessle@owncloud.com>
Date: Mon, 17 Jun 2013 12:51:08 +0000 (+0200)
Subject: Merge branch 'master' into fix_glob_escaping
X-Git-Tag: v6.0.0alpha2~620^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=99c62dfd768d17ba27078cd613058c676917f76f;p=nextcloud-server.git

Merge branch 'master' into fix_glob_escaping

Conflicts:
	apps/files_trashbin/lib/trash.php
---

99c62dfd768d17ba27078cd613058c676917f76f
diff --cc 3rdparty
index 3ef9f738a91,3ef9f738a91..e312294ef62
--- a/3rdparty
+++ b/3rdparty
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 3ef9f738a9107879dddc7d97842cf4d2198fae4c
++Subproject commit e312294ef62873df2b8c02e774f9dfe1b7fbc38d
diff --cc apps/files_trashbin/lib/trash.php
index 2e9c00039db,7b8d3cb4252..1235d9d2ee0
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@@ -48,15 -47,22 +48,22 @@@ class Trashbin 
  	 */
  	public static function move2trash($file_path) {
  		$user = \OCP\User::getUser();
 -		$view = new \OC\Files\View('/'. $user);
 +		$view = new \OC\Files\View('/' . $user);
  		if (!$view->is_dir('files_trashbin')) {
  			$view->mkdir('files_trashbin');
+ 		}
+ 		if (!$view->is_dir('files_trashbin/files')) {
  			$view->mkdir('files_trashbin/files');
+ 		}
+ 		if (!$view->is_dir('files_trashbin/versions')) {
  			$view->mkdir('files_trashbin/versions');
+ 		}
+ 		if (!$view->is_dir('files_trashbin/keyfiles')) {
  			$view->mkdir('files_trashbin/keyfiles');
+ 		}
+ 		if (!$view->is_dir('files_trashbin/share-keys')) {
  			$view->mkdir('files_trashbin/share-keys');
  		}
- 
  		$path_parts = pathinfo($file_path);
  
  		$filename = $path_parts['basename'];