Merge branch '2014.11-develop' into 2015.11
[tine20] / tine20 / Calendar / Backend / Sql.php
index 239d286..1acb89b 100644 (file)
@@ -162,7 +162,7 @@ class Calendar_Backend_Sql extends Tinebase_Backend_Sql_Abstract
             $_pagination = new Tinebase_Model_Pagination();
         }
 
-        $getDeleted = !!$_filter && $_filter->getFilter('is_deleted');
+        $getDeleted = is_object($_filter) && $_filter->getFilter('is_deleted');
         $select = parent::_getSelect('*', $getDeleted);
         
         $select->joinLeft(