Merge branch '2014.11-develop' into 2015.11

diff --git a/tine20/Calendar/Model/PeriodFilter.php b/tine20/Calendar/Model/PeriodFilter.php
index b7d0adc..ad1cbe5 100644 (file)
--- a/tine20/Calendar/Model/PeriodFilter.php
+++ b/tine20/Calendar/Model/PeriodFilter.php
@@ -121,6 +121,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),
                 )),