aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-13 07:52:36 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-08-13 07:52:36 +0200
commitdc55863cadaaa02e9435cd6c9a74c2dce4aaf489 (patch)
tree750015e03d1337083c95f131fb7b01d4e802ce4d /phpBB/phpbb/user.php
parentMerge pull request #3827 from Nicofuma/ticket/14096 (diff)
parentMerge pull request #3763 from Zoddo/ticket/13968 (diff)
downloadphpbb-dc55863cadaaa02e9435cd6c9a74c2dce4aaf489.tar.gz
phpbb-dc55863cadaaa02e9435cd6c9a74c2dce4aaf489.tar.bz2
phpbb-dc55863cadaaa02e9435cd6c9a74c2dce4aaf489.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/user.php')
-rw-r--r--phpBB/phpbb/user.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index fc125f5edc..173b20ee53 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -327,6 +327,14 @@ class user extends \phpbb\session
// After calling it we continue script execution...
phpbb_user_session_handler();
+ /**
+ * Execute code at the end of user setup
+ *
+ * @event core.user_setup_after
+ * @since 3.1.6-RC1
+ */
+ $phpbb_dispatcher->dispatch('core.user_setup_after');
+
// If this function got called from the error handler we are finished here.
if (defined('IN_ERROR_HANDLER'))
{