mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-18 07:31:32 +02:00
Code Issues Releases Wiki Activity

[ticket/12841] Make config position default to after

Browse Source 
PHPBB3-12841
This commit is contained in:
Matt Friedman
2014-07-28 22:27:01 -05:00
parent 6576e0eb88
commit ced76b5f4d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/functions_acp.php
View File

@@ -665,14 +665,15 @@ function validate_range($value_ary, &$error)
* @param array $add_config_vars An array of new config display vars * @param array $add_config_vars An array of new config display vars
* @param array $where Where to place the new config vars, * @param array $where Where to place the new config vars,
* before or after an exisiting config, as an array * before or after an exisiting config, as an array
* of the form: array('after' => 'config_name') * of the form: array('after' => 'config_name') or
* array('before' => 'config_name').
* @return array The array of config display vars * @return array The array of config display vars
*/ */
function phpbb_insert_config_array($display_vars, $add_config_vars, $where) function phpbb_insert_config_array($display_vars, $add_config_vars, $where)
{ {
if (is_array($where) && array_key_exists(current($where), $display_vars)) if (is_array($where) && array_key_exists(current($where), $display_vars))
{ {
$position = array_search(current($where), array_keys($display_vars)) + ((key($where) == 'after') ? 1 : 0); $position = array_search(current($where), array_keys($display_vars)) + ((key($where) == 'before') ? 0 : 1);
$display_vars = array_merge( $display_vars = array_merge(
array_slice($display_vars, 0, $position), array_slice($display_vars, 0, $position),
$add_config_vars, $add_config_vars,

4
tests/functions/insert_config_array_test.php
View File

@@ -92,13 +92,13 @@ class phpbb_functions_insert_config_array_test extends phpbb_test_case
'acp_config_5' => array(), 'acp_config_5' => array(),
), ),
), ),
array( // When after|before is not used correctly (defaults to before) array( // When after|before is not used correctly (defaults to after)
array('new_config_1' => array()), array('new_config_1' => array()),
array('foobar' => 'acp_config_1'), array('foobar' => 'acp_config_1'),
array( array(
'legend1' => '', 'legend1' => '',
'new_config_1' => array(),
'acp_config_1' => array(), 'acp_config_1' => array(),
'new_config_1' => array(),
'acp_config_2' => array(), 'acp_config_2' => array(),
'acp_config_3' => array(), 'acp_config_3' => array(),
'acp_config_4' => array(), 'acp_config_4' => array(),