diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-20 15:13:13 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-24 17:26:27 +0200 |
| commit | c2dace762ec295c7a2d67758006b1fff56f1f573 (patch) | |
| tree | 5717be8bfd7de174b7435f7c729250d4e115fa0c /phpBB/phpbb | |
| parent | 8599554443deee1d655ffc4ae0ad97c60ba0a123 (diff) | |
| download | forums-c2dace762ec295c7a2d67758006b1fff56f1f573.tar forums-c2dace762ec295c7a2d67758006b1fff56f1f573.tar.gz forums-c2dace762ec295c7a2d67758006b1fff56f1f573.tar.bz2 forums-c2dace762ec295c7a2d67758006b1fff56f1f573.tar.xz forums-c2dace762ec295c7a2d67758006b1fff56f1f573.zip | |
[ticket/12273] Fix long $vars lines for existing events
PHPBB3-12273
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/log/log.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index 44fba06d9d..b0aa637002 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -405,7 +405,9 @@ class log implements \phpbb\log\log_interface * e.g.: 'AND l.forum_id = 1' * @since 3.1-A1 */ - $vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional'); + $vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id'); + $vars = array_merge($vars, array('user_id', 'log_time', 'sort_by', 'keywords')); + $vars = array_merge($vars, array('profile_url', 'log_type', 'sql_additional')); extract($this->dispatcher->trigger_event('core.get_logs_modify_type', compact($vars))); if ($log_type === false) 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; |