mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-23 11:21:42 +02:00
Fix setting of filter for nextmatchs
This commit is contained in:
parent
452246b689
commit
c81c7c5428
@ -367,8 +367,8 @@
|
|||||||
$this->limit = 30;
|
$this->limit = 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
global $filter;
|
// global $filter;
|
||||||
if (empty($filter) || !isset($filter))
|
if (empty($this->filter) || !isset($this->filter))
|
||||||
{
|
{
|
||||||
if($this->prefs['default_filter'])
|
if($this->prefs['default_filter'])
|
||||||
{
|
{
|
||||||
@ -428,14 +428,15 @@
|
|||||||
$total_records = $this->bo->total;
|
$total_records = $this->bo->total;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* global here so nextmatchs accepts our setting of $query */
|
/* global here so nextmatchs accepts our setting of $query and $filter */
|
||||||
global $query;
|
global $query,$filter;
|
||||||
|
|
||||||
$query = $this->query;
|
$query = $this->query;
|
||||||
|
$filter = $this->filter;
|
||||||
|
|
||||||
$search_filter = $phpgw->nextmatchs->show_tpl('/index.php',
|
$search_filter = $phpgw->nextmatchs->show_tpl('/index.php',
|
||||||
$this->start, $total_records,'&menuaction=addressbook.uiaddressbook.get_list','75%',
|
$this->start, $total_records,'&menuaction=addressbook.uiaddressbook.get_list','75%',
|
||||||
$phpgw_info['theme']['th_bg'],1,1,1,1,$this->cat_id);
|
$phpgw_info['theme']['th_bg'],1,1,1,1,$this->cat_id);
|
||||||
$query = '';
|
$query = $filter = '';
|
||||||
|
|
||||||
$lang_showing = $phpgw->nextmatchs->show_hits($total_records,$this->start);
|
$lang_showing = $phpgw->nextmatchs->show_hits($total_records,$this->start);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user