diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 10:41:46 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 10:41:46 +0200 |
| commit | c96c6877bf51868b48865023e94c0ffeaba05f19 (patch) | |
| tree | fd5694b25e6ad4ef884f26e6185845afb3d54bc1 | |
| parent | f2edec90b0f94985a0abe8e82e050c7cde82fa60 (diff) | |
| parent | f585f48aca3053862e81d0ff63956940c53878e7 (diff) | |
| download | forums-c96c6877bf51868b48865023e94c0ffeaba05f19.tar forums-c96c6877bf51868b48865023e94c0ffeaba05f19.tar.gz forums-c96c6877bf51868b48865023e94c0ffeaba05f19.tar.bz2 forums-c96c6877bf51868b48865023e94c0ffeaba05f19.tar.xz forums-c96c6877bf51868b48865023e94c0ffeaba05f19.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/ucp/ucp_activate.php
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index f535073434..5bfb688d3a 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -30,7 +30,7 @@ class ucp_activate function main($id, $mode) { global $config, $phpbb_root_path, $phpEx, $request; - global $db, $user, $auth, $template, $phpbb_container, $phpbb_log; + global $db, $user, $auth, $template, $phpbb_container, $phpbb_log, $phpbb_dispatcher; $user_id = $request->variable('u', 0); $key = $request->variable('k', ''); @@ -150,6 +150,17 @@ class ucp_activate } } + /** + * This event can be used to modify data after user account's activation + * + * @event core.ucp_activate_after + * @var array user_row Array with some user data + * @var string message Language string of the message that will be displayed to the user + * @since 3.1.6-RC1 + */ + $vars = array('user_row', 'message'); + extract($phpbb_dispatcher->trigger_event('core.ucp_activate_after', compact($vars))); + meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); trigger_error($user->lang[$message]); } |