From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Fri, 22 Feb 2013 15:43:13 +0000 (-0800)
Subject: Merge pull request #1859 from owncloud/blacklist-fix
X-Git-Tag: v5.0.0beta2~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=608ebb59ddab462383fb156189989da6290e04c9;p=nextcloud-server.git

Merge pull request #1859 from owncloud/blacklist-fix

Add OC\Files\Filesystem::isFileBlacklisted
---

608ebb59ddab462383fb156189989da6290e04c9
diff --cc lib/files/filesystem.php
index 8f171283207,36a21288b4d..401ee8417e5
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@@ -219,14 -219,11 +219,14 @@@ class Filesystem 
  		}
  		$parser = new \OC\ArrayParser();
  
 +		$root = \OC_User::getHome($user);
 +		self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
 +		
  		// Load system mount points
  		if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) {
- 			if(is_file(\OC::$SERVERROOT . '/config/mount.json')){
+ 			if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
  				$mountConfig = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mount.json'), true);
- 			}elseif(is_file(\OC::$SERVERROOT . '/config/mount.php')){
+ 			} elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) {
  				$mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php'));
  			}
  			if (isset($mountConfig['global'])) {
@@@ -262,10 -259,12 +262,10 @@@
  			}
  		}
  		// Load personal mount points
 -		$root = \OC_User::getHome($user);
 -		self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
  		if (is_file($root . '/mount.php') or is_file($root . '/mount.json')) {
- 			if (is_file($root . '/mount.json')){
+ 			if (is_file($root . '/mount.json')) {
  				$mountConfig = json_decode(file_get_contents($root . '/mount.json'), true);
- 			} elseif (is_file($root . '/mount.php')){
+ 			} elseif (is_file($root . '/mount.php')) {
  				$mountConfig = $parser->parsePHP(file_get_contents($root . '/mount.php'));
  			}
  			if (isset($mountConfig['user'][$user])) {