aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/functions_acp.php2
-rw-r--r--tests/functions/insert_config_array_test.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 264276338a..2edb44d408 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -668,7 +668,7 @@ function validate_range($value_ary, &$error)
* of the form: array('after' => 'config_name')
* @return array The array of config display vars
*/
-function 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))
{
diff --git a/tests/functions/insert_config_array_test.php b/tests/functions/insert_config_array_test.php
index 2ff7ae4853..8034ce982d 100644
--- a/tests/functions/insert_config_array_test.php
+++ b/tests/functions/insert_config_array_test.php
@@ -135,7 +135,7 @@ class phpbb_functions_insert_config_array_test extends phpbb_test_case
public function test_insert_config_array($new_config, $position, $expected)
{
$config_array = $this->config_display_vars();
- $new_config_array = insert_config_array($config_array, $new_config, $position);
+ $new_config_array = phpbb_insert_config_array($config_array, $new_config, $position);
$this->assertSame($expected, $new_config_array);
}