1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-07 09:24:14 +02:00

Merge branch '3.2.x'

This commit is contained in:
Oliver Schramm 2017-09-10 15:32:28 +02:00
commit 99306435bd
3 changed files with 27 additions and 0 deletions
phpBB
adm/style
docs
includes/acp

@ -231,6 +231,10 @@
<!-- INCLUDE permission_mask.html -->
<!-- ELSE -->
<!-- EVENT acp_users_mode_add -->
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->

@ -498,6 +498,13 @@ acp_styles_list_before
* Since: 3.1.7-RC1
* Purpose: Add content before list of styles
acp_users_mode_add
===
* Locations:
+ adm/style/acp_users.html
* Since: 3.2.2-RC1
* Purpose: Add extra modes to the ACP user page
acp_users_profile_before
===
* Locations:

@ -2576,6 +2576,22 @@ class acp_users
break;
default:
/**
* Additional modes provided by extensions
*
* @event core.acp_users_mode_add
* @var string mode New mode
* @var int user_id User id of the user to manage
* @var array user_row Array with user data
* @var array error Array with errors data
* @since 3.2.2-RC1
*/
$vars = array('mode', 'user_id', 'user_row', 'error');
extract($phpbb_dispatcher->trigger_event('core.acp_users_mode_add', compact($vars)));
break;
}
// Assign general variables