Merge branch '2015.11-develop' into 2016.11

[tine20] / tine20 / Filemanager / Frontend / Json.php

diff --git a/tine20/Filemanager/Frontend/Json.php b/tine20/Filemanager/Frontend/Json.php
index 4499315..3b5a023 100644 (file)
--- a/tine20/Filemanager/Frontend/Json.php
+++ b/tine20/Filemanager/Frontend/Json.php
@@ -36,7 +36,7 @@ class Filemanager_Frontend_Json extends Tinebase_Frontend_Json_Abstract
      */
     public function searchNodes($filter, $paging)
     {
      */
     public function searchNodes($filter, $paging)
     {

-        $result = $this->_search($filter, $paging, Filemanager_Controller_Node::getInstance(), 'Tinebase_Model_Tree_Node_Filter');
+        $result = $this->_search($filter, $paging, Filemanager_Controller_Node::getInstance(), 'Filemanager_Model_NodeFilter');

         $this->_removeAppIdFromPathFilter($result);
         
         return $result;
         $this->_removeAppIdFromPathFilter($result);
         
         return $result;