aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-20 15:13:13 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-04-24 17:26:27 +0200
commitc2dace762ec295c7a2d67758006b1fff56f1f573 (patch)
tree5717be8bfd7de174b7435f7c729250d4e115fa0c /phpBB/phpbb/user.php
parent[ticket/12273] Fix unit test for multi line $vars (diff)
downloadphpbb-c2dace762ec295c7a2d67758006b1fff56f1f573.tar.gz
phpbb-c2dace762ec295c7a2d67758006b1fff56f1f573.tar.bz2
phpbb-c2dace762ec295c7a2d67758006b1fff56f1f573.zip
[ticket/12273] Fix long $vars lines for existing events
PHPBB3-12273
Diffstat (limited to 'phpBB/phpbb/user.php')
-rw-r--r--phpBB/phpbb/user.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index b9b3896606..1f65b63522 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -145,7 +145,8 @@ class user extends \phpbb\session
* @var mixed style_id Style we are going to display
* @since 3.1-A1
*/
- $vars = array('user_data', 'user_lang_name', 'user_date_format', 'user_timezone', 'lang_set', 'lang_set_ext', 'style_id');
+ $vars = array('user_data', 'user_lang_name', 'user_date_format', 'lang_set');
+ $vars = array_merge($vars, array('user_timezone', 'lang_set_ext', 'style_id'));
extract($phpbb_dispatcher->trigger_event('core.user_setup', compact($vars)));
$this->data = $user_data;