From c1689c7328916811d3c63a0da436d51792bc2748 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 18 Feb 2014 22:36:22 +0000 Subject: [PATCH] Fix account selection missing members of non-primary groups --- etemplate/inc/class.etemplate_widget_menupopup.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etemplate/inc/class.etemplate_widget_menupopup.inc.php b/etemplate/inc/class.etemplate_widget_menupopup.inc.php index d7627e0dad..cd1def65ee 100644 --- a/etemplate/inc/class.etemplate_widget_menupopup.inc.php +++ b/etemplate/inc/class.etemplate_widget_menupopup.inc.php @@ -475,7 +475,7 @@ class etemplate_widget_menupopup extends etemplate_widget { $type = $widget->attrs['account_type']; } - + $select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection']; // in case of readonly, we read/create only the needed entries, as reading accounts is expensive if (!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value); @@ -505,6 +505,7 @@ class etemplate_widget_menupopup extends etemplate_widget if($select_pref == 'popup') break; $no_lang = True; + $accs = array(); if(!$mygroups) { $accs = $GLOBALS['egw']->accounts->search(array( @@ -516,7 +517,7 @@ class etemplate_widget_menupopup extends etemplate_widget { foreach($mygroups as $group) { - $accs = $GLOBALS['egw']->accounts->search(array( + $accs += $GLOBALS['egw']->accounts->search(array( 'type' => $group, 'order' => 'account_fullname', // order according to pref of how to display accounts ));