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

fix for not correctly store last selected search-type

Browse Source
This commit is contained in:
Klaus Leithoff 2016-03-24 15:16:10 +00:00
parent e3aef81959
commit 7403f9100b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,7 +738,10 @@ class mail_ui
if (html::$ua_mobile) $sel_options['toolbar'] = $this->get_toolbar_actions(); if (html::$ua_mobile) $sel_options['toolbar'] = $this->get_toolbar_actions();
//we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....) //we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....)
if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['cat_id']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject'); if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search']))
{
$content[self::$nm_index]['cat_id']=($content[self::$nm_index]['cat_id']?(!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]&&($content[self::$nm_index]['cat_id']=='quick'||$content[self::$nm_index]['cat_id']=='quickwithcc')?'subject':$content[self::$nm_index]['cat_id']):(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject'));
}
$readonlys = $preserv = array(); $readonlys = $preserv = array();
if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__); if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
} }
@ -1350,6 +1353,7 @@ class mail_ui
$prefchanged = false; $prefchanged = false;
if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']) || ($query['cat_id'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType'])) if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']) || ($query['cat_id'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']))
{ {
//error_log(__METHOD__.__LINE__.' Changing userPref ActivesearchType:'.$query['cat_id']);
$GLOBALS['egw']->preferences->add('mail','ActiveSearchType',$query['cat_id'],'user'); $GLOBALS['egw']->preferences->add('mail','ActiveSearchType',$query['cat_id'],'user');
$prefchanged = true; $prefchanged = true;
} }