From 6db1a2bfad121dbe0502869eea275a753d0d3a25 Mon Sep 17 00:00:00 2001 From: "Forumhulp.com" Date: Sun, 2 Mar 2014 08:19:14 +0100 Subject: [PATCH 1/5] [ticket/12241] Event to add and/or modify acp_board configurations PHPBB3-12241 --- phpBB/includes/acp/acp_board.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 10fbde8c9b..e43db9fd38 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -455,6 +455,18 @@ class acp_board trigger_error('NO_MODE', E_USER_ERROR); break; } + + + /** + * Event to add and/or modify acp_board configurations + * + * @event core.acp_config_edit_add + * @since 3.1-A4 + */ + global $phpbb_dispatcher; + $vars = array('display_vars', 'mode'); + extract($phpbb_dispatcher->trigger_event('core.acp_config_edit_add', compact($vars))); + if (isset($display_vars['lang'])) { From 9d87b1a3c705e63d75f28492d2607ffa808101bb Mon Sep 17 00:00:00 2001 From: "Forumhulp.com" Date: Mon, 3 Mar 2014 09:15:15 +0100 Subject: [PATCH 2/5] [ticket/12241] Move $phpbb_dispatcher to the top PHPBB3-12241 --- phpBB/includes/acp/acp_board.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index e43db9fd38..b07fd77415 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -28,7 +28,7 @@ class acp_board { global $db, $user, $auth, $template; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - global $cache, $phpbb_container; + global $cache, $phpbb_container, $phpbb_dispatcher; $user->add_lang('acp/board'); @@ -463,7 +463,6 @@ class acp_board * @event core.acp_config_edit_add * @since 3.1-A4 */ - global $phpbb_dispatcher; $vars = array('display_vars', 'mode'); extract($phpbb_dispatcher->trigger_event('core.acp_config_edit_add', compact($vars))); From 4b7a718f85277ff79b877aab07738501247e1e03 Mon Sep 17 00:00:00 2001 From: "Forumhulp.com" Date: Mon, 3 Mar 2014 09:21:40 +0100 Subject: [PATCH 3/5] [ticket/12241] Add submit to event variables PHPBB3-12241 --- phpBB/includes/acp/acp_board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index b07fd77415..e265ddc573 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -463,7 +463,7 @@ class acp_board * @event core.acp_config_edit_add * @since 3.1-A4 */ - $vars = array('display_vars', 'mode'); + $vars = array('display_vars', 'mode', 'submit'); extract($phpbb_dispatcher->trigger_event('core.acp_config_edit_add', compact($vars))); From 7821cf0257bba5f4c920118ede0637ead92dcb74 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 14 Mar 2014 09:41:23 +0100 Subject: [PATCH 4/5] [ticket/12241] Update event name and version match our guidelines PHPBB3-12241 --- phpBB/includes/acp/acp_board.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index e265ddc573..b818227242 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -455,17 +455,15 @@ class acp_board trigger_error('NO_MODE', E_USER_ERROR); break; } - - + /** * Event to add and/or modify acp_board configurations * - * @event core.acp_config_edit_add - * @since 3.1-A4 + * @event core.acp_board_config_edit_add + * @since 3.1.0-a4 */ $vars = array('display_vars', 'mode', 'submit'); - extract($phpbb_dispatcher->trigger_event('core.acp_config_edit_add', compact($vars))); - + extract($phpbb_dispatcher->trigger_event('core.acp_board_config_edit_add', compact($vars))); if (isset($display_vars['lang'])) { From 56318fb5c42873b59f958dcaf1dc15b7005172d9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 14 Mar 2014 12:49:04 +0100 Subject: [PATCH 5/5] [ticket/12241] Add @var for the arguments PHPBB3-12241 --- phpBB/includes/acp/acp_board.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index b818227242..2c0eb95cd5 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -460,6 +460,9 @@ class acp_board * Event to add and/or modify acp_board configurations * * @event core.acp_board_config_edit_add + * @var array display_vars Array of config values to display and process + * @var string mode Mode of the config page we are displaying + * @var boolean submit Do we display the form or process the submission * @since 3.1.0-a4 */ $vars = array('display_vars', 'mode', 'submit');