Fix 'next 7 days' filter (#3000)
This commit is contained in:
parent
bde3ea19cd
commit
9db4aeaf7e
1 changed files with 2 additions and 2 deletions
|
@ -756,9 +756,9 @@ class tasklist extends rcube_plugin
|
||||||
$mask |= self::FILTER_MASK_TODAY;
|
$mask |= self::FILTER_MASK_TODAY;
|
||||||
if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
|
if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
|
||||||
$mask |= self::FILTER_MASK_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;
|
$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;
|
$mask |= self::FILTER_MASK_LATER;
|
||||||
|
|
||||||
return $mask;
|
return $mask;
|
||||||
|
|
Loading…
Add table
Reference in a new issue