"; - var_dump($error); - echo ""; + + echo $error['msg'] . "\n"; } /** diff --git a/tine20/Tinebase/Model/Filter/Query.php b/tine20/Tinebase/Model/Filter/Query.php index 6c369683bda..74811a7fcf6 100644 --- a/tine20/Tinebase/Model/Filter/Query.php +++ b/tine20/Tinebase/Model/Filter/Query.php @@ -68,7 +68,7 @@ public function __construct(array $_data = array(), $_condition = '', $_options $this->_operator = $_data['operator']; if (!empty($this->_value)) { - $queries = explode(' ', $this->_value); + $queries = is_array($this->_value) ? $this->_value : explode(' ', $this->_value); /** @var Tinebase_Model_Filter_FilterGroup $parentFilterGroup */ $parentFilterGroup = $this->_options['parentFilter']; diff --git a/tine20/Tinebase/Model/Grants.php b/tine20/Tinebase/Model/Grants.php index e8e543d10bf..941ecbfe588 100644 --- a/tine20/Tinebase/Model/Grants.php +++ b/tine20/Tinebase/Model/Grants.php @@ -463,8 +463,4 @@ public static function addCustomGetSharedContainerSQL(Zend_Db_Select $_select, Tinebase_Model_Application $_application, $_accountId, $_grant) { } - - public function setSpecialGrantsByUser($_accountId) - { - } } diff --git a/tine20/Tinebase/Model/Tree/Node/Path.php b/tine20/Tinebase/Model/Tree/Node/Path.php index 4284c524c6a..e862808dfec 100644 --- a/tine20/Tinebase/Model/Tree/Node/Path.php +++ b/tine20/Tinebase/Model/Tree/Node/Path.php @@ -6,7 +6,7 @@ * @subpackage Model * @license http://www.gnu.org/licenses/agpl.html AGPL Version 3 * @author Philipp Schüle