Merge pull request #1859 from owncloud/blacklist-fix

Add OC\Files\Filesystem::isFileBlacklisted

diff --cc lib/files/filesystem.php
index 8f171283207149772eef74800135b10886ba091d,36a21288b4de8d514d3ec9728fa1967582f34d10..401ee8417e5a7abb192c1bc05a213657ac4ba9d6
--- 1/lib/files/filesystem.php
--- 2/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])) {