makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-10-17 21:01:25 +02:00
commit 867d0bfb2f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/acp/acp_users.php
View file

@ -813,16 +813,22 @@ class acp_users
break; break;
default: default:
$u_action = $this->u_action;
/** /**
* Run custom quicktool code * Run custom quicktool code
* *
* @event core.acp_users_overview_run_quicktool * @event core.acp_users_overview_run_quicktool
* @var array user_row Current user data
* @var string action Quick tool that should be run * @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 * @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))); extract($phpbb_dispatcher->trigger_event('core.acp_users_overview_run_quicktool', compact($vars)));
unset($u_action);
break; break;
} }