Branch 'roundcubemail-plugins-kolab-3.1' - plugins/tasklist

[Thomas Brüderli]

 plugins/tasklist/tasklist.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69935eec09ece917f6967d1aefabb9b6d69d0b46
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Apr 17 18:40:35 2014 +0200

    Fix 'next 7 days' filter (#3000)

diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 1eaacbd..2758626 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -742,9 +742,9 @@ class tasklist extends rcube_plugin
             $mask |= self::FILTER_MASK_TODAY;
         if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
             $mask |= self::FILTER_MASK_TOMORROW;
-        if ($start > $tomorrow || ($duedate > $tomorrow && $duedate <= $weeklimit))
+        if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
             $mask |= self::FILTER_MASK_WEEK;
-        if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
+        else if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
             $mask |= self::FILTER_MASK_LATER;
 
         return $mask;