Merge branch '2014.11' into 2014.11-develop

[tine20] / tine20 / Tinebase / FileSystem.php

diff --git a/tine20/Tinebase/FileSystem.php b/tine20/Tinebase/FileSystem.php
index 96c140d..3764afb 100644 (file)
--- a/tine20/Tinebase/FileSystem.php
+++ b/tine20/Tinebase/FileSystem.php
@@ -65,7 +65,7 @@ class Tinebase_FileSystem implements Tinebase_Controller_Interface
         $this->_fileObjectBackend  = new Tinebase_Tree_FileObject();
         $this->_treeNodeBackend    = new Tinebase_Tree_Node();
         
-        if (! Setup_Controller::getInstance()->isFilesystemAvailable()) {
+        if (! Tinebase_Core::isFilesystemAvailable()) {
             throw new Tinebase_Exception_Backend('No base path (filesdir) configured or path not writeable');
         }
         
@@ -932,7 +932,6 @@ class Tinebase_FileSystem implements Tinebase_Controller_Interface
             $nodeId = $nodeId->getArrayOfIds();
             $operator = 'in';
         } else {
-            $nodeId = $_nodeId;
             $operator = 'equals';
         }