Merge branch '2015.11' into 2015.11-develop
[tine20] / tine20 / Calendar / Model / PeriodFilter.php
index 5da377b..c38c35d 100644 (file)
@@ -133,6 +133,7 @@ class Calendar_Model_PeriodFilter extends Tinebase_Model_Filter_Abstract
                 array('field' => 'rrule',        'operator' => 'notnull', 'value' => NULL),
                 array('field' => 'dtstart',      'operator' => 'before',  'value' => $this->_until),
                 array('condition' => Tinebase_Model_Filter_FilterGroup::CONDITION_OR, 'filters' => array(
+                    array('field' => 'rrule_until',  'operator' => 'equals',  'value' => $this->_from),
                     array('field' => 'rrule_until',  'operator' => 'after',   'value' => $this->_from),
                     array('field' => 'rrule_until',  'operator' => 'isnull',  'value' => NULL),
                 )),