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/includes/acp | |
| 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/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 84382b6276..a05b1df760 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -159,7 +159,9 @@ class acp_bbcodes * submitting form when $warn_text is true * @since 3.1.0-a3 */ - $vars = array('action', 'sql_ary', 'bbcode_id', 'display_on_posting', 'bbcode_match', 'bbcode_tpl', 'bbcode_helpline', 'hidden_fields'); + $vars = array('action', 'sql_ary', 'bbcode_id', 'display_on_posting'); + $vars = array_merge($vars, array('bbcode_match', 'bbcode_tpl')); + $vars = array_merge($vars, array('bbcode_helpline', 'hidden_fields')); extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create', compact($vars))); $warn_text = preg_match('%<[^>]*\{text[\d]*\}[^>]*>%i', $bbcode_tpl); diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index c47d9bc185..0163d12ed0 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -707,7 +707,8 @@ class acp_forums * @var array template_data Array with new forum data * @since 3.1-A1 */ - $vars = array('action', 'update', 'forum_id', 'row', 'forum_data', 'parents_list', 'errors', 'template_data'); + $vars = array('action', 'update', 'forum_id', 'row', 'forum_data'); + $vars = array_merge($vars, array('parents_list', 'errors', 'template_data')); extract($phpbb_dispatcher->trigger_event('core.acp_manage_forums_display_form', compact($vars))); $template->assign_vars($template_data); |