holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix call by reference issues

Browse Source
This commit is contained in:
leithoff 2016-06-14 11:28:03 +02:00
parent e931fb1cc4
commit 4d7360856a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mail/inc/class.mail_ui.inc.php
View File

@ -1458,12 +1458,13 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
if ($maxMessages > 75) if ($maxMessages > 75)
{ {
$rByUid = true;
$_sR = $mail_ui->mail_bo->getSortedList( $_sR = $mail_ui->mail_bo->getSortedList(
$_folderName, $_folderName,
$sort, $sort,
$reverse, $reverse,
$filter, $filter,
$rByUid=true $rByUid
); );
$rowsFetched['messages'] = $_sR['count']; $rowsFetched['messages'] = $_sR['count'];
$ids = $_sR['match']->ids; $ids = $_sR['match']->ids;
@ -4568,12 +4569,14 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
$filter2toggle['status'][] = $query['filter']; $filter2toggle['status'][] = $query['filter'];
} }
$rByUid = true;
$reverse = 1;
$_sRt = $this->mail_bo->getSortedList( $_sRt = $this->mail_bo->getSortedList(
$folder, $folder,
$sort=0, $sort=0,
$reverse=1, $reverse,
$filter2toggle, $filter2toggle,
$rByUid=true, $rByUid,
false false
); );
$messageListForToggle = $_sRt['match']->ids; $messageListForToggle = $_sRt['match']->ids;
@ -4582,12 +4585,14 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
$filter['status'][] = $query['filter']; $filter['status'][] = $query['filter'];
} }
$rByUid=true;
$reverse = 1;
$_sR = $this->mail_bo->getSortedList( $_sR = $this->mail_bo->getSortedList(
$folder, $folder,
$sort=0, $sort=0,
$reverse=1, $reverse,
$filter, $filter,
$rByUid=true, $rByUid,
false false
); );
$messageList = $_sR['match']->ids; $messageList = $_sR['match']->ids;
@ -4617,12 +4622,14 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$_flag = ($query['filter']=='unseen' && $_flag=='read' ? 'read' : ($query['filter']=='seen'&& $_flag=='read'?'unread':($_flag==$query['filter']?'un'.$_flag:$_flag))); $_flag = ($query['filter']=='unseen' && $_flag=='read' ? 'read' : ($query['filter']=='seen'&& $_flag=='read'?'unread':($_flag==$query['filter']?'un'.$_flag:$_flag)));
} }
if(Mail::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter)); if(Mail::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
$rByUid = true;
$reverse = 1;
$_sR = $this->mail_bo->getSortedList( $_sR = $this->mail_bo->getSortedList(
$folder, $folder,
$sort=0, $sort=0,
$reverse=1, $reverse,
$filter, $filter,
$rByUid=true, $rByUid,
false false
); );
$messageList = $_sR['match']->ids; $messageList = $_sR['match']->ids;