From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 20 Feb 2013 23:05:30 +0000 (+0100)
Subject: Merge branch 'master' into trashbin_encryption
X-Git-Tag: v5.0.0beta2~9^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6aed7abfbe4a58cec822bdd16d8c71d4bac14c28;p=nextcloud-server.git

Merge branch 'master' into trashbin_encryption
---

6aed7abfbe4a58cec822bdd16d8c71d4bac14c28
diff --cc apps/files_trashbin/index.php
index d575c75f1a3,d0b3030dbf8..2276fee2f81
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@@ -16,8 -16,10 +16,9 @@@ OCP\Util::addScript('files', 'filelist'
  
  $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
  
+ $result = array();
  if ($dir) {
 -	$dirlisting = true;
 -	$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin');
 +	$dirlisting = true;
  	$fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
  	$dirContent = opendir($fullpath);
  	$i = 0;