From a184fbcf20a102af8e9ac53cd9bee23561531fa2 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 6 Jun 2012 20:44:39 +0000 Subject: [PATCH] Handle action_popup namespace, if present --- infolog/inc/class.infolog_ui.inc.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 0d3abaa12d..44dd03cbe4 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -653,12 +653,22 @@ class infolog_ui // Action has an additional action - add / delete, etc. Buttons named _action[action_name] if(in_array($multi_action, array('link', 'responsible'))) { - $values['nm']['multi_action'] .= '_' . key($values[$multi_action . '_action']); - if(is_array($values[$multi_action])) + // eTemplate ignores the _popup namespace, but et2 doesn't + if($values[$multi_action.'_popup']) { - $values[$multi_action] = implode(',',$values[$multi_action]); + $popup =& $values[$multi_action.'_popup']; } - $values['nm']['multi_action'] .= '_' . $values[$multi_action]; + else + { + $popup =& $values; + } + + $values['nm']['multi_action'] .= '_' . key($popup[$multi_action . '_action']); + if(is_array($popup[$multi_action])) + { + $popup[$multi_action] = implode(',',$popup[$multi_action]); + } + $values['nm']['multi_action'] .= '_' . $popup[$multi_action]; } if ($this->action($values['nm']['multi_action'], $values['nm']['selected'], $values['nm']['select_all'], $success, $failed, $action_msg, $values['nm'], $msg, $values['nm']['checkboxes']['no_notifications']))