diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-12 18:39:29 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-12 18:39:29 +0200 |
| commit | f90b16df0d1c4a17c1874b1416f8c21495d7b4f7 (patch) | |
| tree | 4e08af03ce6a260f586d75cbb9d188b4864f3157 /phpBB/includes | |
| parent | a5ab2eb564eeb33d9cd97a4c21b2fb8f340f9120 (diff) | |
| download | forums-f90b16df0d1c4a17c1874b1416f8c21495d7b4f7.tar forums-f90b16df0d1c4a17c1874b1416f8c21495d7b4f7.tar.gz forums-f90b16df0d1c4a17c1874b1416f8c21495d7b4f7.tar.bz2 forums-f90b16df0d1c4a17c1874b1416f8c21495d7b4f7.tar.xz forums-f90b16df0d1c4a17c1874b1416f8c21495d7b4f7.zip | |
[ticket/14234] Use replacement variables instead of references in events
PHPBB3-14234
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 24 | ||||
| -rw-r--r-- | phpBB/includes/functions_acp.php | 8 |
2 files changed, 24 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index f252f2a594..d81eef7871 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -950,17 +950,21 @@ class acp_forums $errors = array(); + $forum_data_ary = $forum_data; /** * Validate the forum data before we create/update the forum * * @event core.acp_manage_forums_validate_data - * @var array forum_data Array with new forum data + * @var array forum_data_ary Array with new forum data * @var array errors Array of errors, should be strings and not * language key. * @since 3.1.0-a1 + * @change 3.1.7-RC1 Replaced forum_data with forum_data_ary */ - $vars = array('forum_data', 'errors'); + $vars = array('forum_data_ary', 'errors'); extract($phpbb_dispatcher->trigger_event('core.acp_manage_forums_validate_data', compact($vars))); + $forum_data = $forum_data_ary; + unset($forum_data_ary); if ($forum_data['forum_name'] == '') { @@ -1058,18 +1062,22 @@ class acp_forums } unset($forum_data_sql['forum_password_unset']); + $forum_data_ary = $forum_data; /** * Remove invalid values from forum_data_sql that should not be updated * * @event core.acp_manage_forums_update_data_before - * @var array forum_data Array with forum data + * @var array forum_data_ary Array with forum data * @var array forum_data_sql Array with data we are going to update * If forum_data_sql[forum_id] is set, we update * that forum, otherwise a new one is created. * @since 3.1.0-a1 + * @change 3.1.7-RC1 Replaced forum_data by forum_data_ary */ - $vars = array('forum_data', 'forum_data_sql'); + $vars = array('forum_data_ary', 'forum_data_sql'); extract($phpbb_dispatcher->trigger_event('core.acp_manage_forums_update_data_before', compact($vars))); + $forum_data = $forum_data_ary; + unset($forum_data_ary); $is_new_forum = !isset($forum_data_sql['forum_id']); @@ -1348,11 +1356,12 @@ class acp_forums $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_FORUM_EDIT', false, array($forum_data['forum_name'])); } + $forum_data_ary = $forum_data; /** * Event after a forum was updated or created * * @event core.acp_manage_forums_update_data_after - * @var array forum_data Array with forum data + * @var array forum_data_ary Array with forum data * @var array forum_data_sql Array with data we updated * @var bool is_new_forum Did we create a forum or update one * If you want to overwrite this value, @@ -1360,9 +1369,12 @@ class acp_forums * @var array errors Array of errors, should be strings and not * language key. * @since 3.1.0-a1 + * @change 3.1.7-RC1 Replaced forum_data with forum_data_ary */ - $vars = array('forum_data', 'forum_data_sql', 'is_new_forum', 'errors'); + $vars = array('forum_data_ary', 'forum_data_sql', 'is_new_forum', 'errors'); extract($phpbb_dispatcher->trigger_event('core.acp_manage_forums_update_data_after', compact($vars))); + $forum_data = $forum_data_ary; + unset($forum_data_ary); return $errors; } diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index eea18a0c47..b6f9de98f3 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -383,6 +383,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) $tpl .= $vars['append']; } + $new_ary = $new; /** * Overwrite the html code we display for the config value * @@ -392,14 +393,17 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) * 1 [optional] => string: size, int: minimum * 2 [optional] => string: max. length, int: maximum * @var string key Should be used for the id attribute in html - * @var array new Array with the config values we display + * @var array new_var Array with the config values we display * @var string name Should be used for the name attribute * @var array vars Array with the options for the config * @var string tpl The resulting html code we display * @since 3.1.0-a1 + * @change 3.1.7-RC1 Replaced new with new_ary */ - $vars = array('tpl_type', 'key', 'new', 'name', 'vars', 'tpl'); + $vars = array('tpl_type', 'key', 'new_ary', 'name', 'vars', 'tpl'); extract($phpbb_dispatcher->trigger_event('core.build_config_template', compact($vars))); + $new = $new_ary; + unset($new); return $tpl; } |