aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-10-17 20:48:49 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-10-17 20:48:49 +0200
commitc1c3004fa1d0dbc739b5b2692a3e1afa0894e035 (patch)
tree8b30c9038e24ded17025539dbb6e8d6af9be9a7d /phpBB/includes/acp
parent7bdff132ffcaa9cd9342efc21e6eb30151219320 (diff)
parent0b42b34531f64d7f62f9b13a75ef8be08309756e (diff)
downloadforums-c1c3004fa1d0dbc739b5b2692a3e1afa0894e035.tar
forums-c1c3004fa1d0dbc739b5b2692a3e1afa0894e035.tar.gz
forums-c1c3004fa1d0dbc739b5b2692a3e1afa0894e035.tar.bz2
forums-c1c3004fa1d0dbc739b5b2692a3e1afa0894e035.tar.xz
forums-c1c3004fa1d0dbc739b5b2692a3e1afa0894e035.zip
Merge pull request #5003 from kasimi/ticket/15409
[ticket/15409] Add u_action to core.acp_users_overview_run_quicktool
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_users.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 3d917c09d7..090cb32ebb 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -813,16 +813,22 @@ class acp_users
break;
default:
+ $u_action = $this->u_action;
+
/**
* Run custom quicktool code
*
* @event core.acp_users_overview_run_quicktool
- * @var array user_row Current user data
* @var string action Quick tool that should be run
+ * @var array user_row Current user data
+ * @var string u_action The u_action link
* @since 3.1.0-a1
+ * @changed 3.2.2-RC1 Added u_action
*/
- $vars = array('action', 'user_row');
+ $vars = array('action', 'user_row', 'u_action');
extract($phpbb_dispatcher->trigger_event('core.acp_users_overview_run_quicktool', compact($vars)));
+
+ unset($u_action);
break;
}