diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-07-24 07:44:35 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-07-24 07:44:35 -0700 |
| commit | 056584680b4603e93c5e428a1177b09fbea88f30 (patch) | |
| tree | 064e9d00301553ef44f87b939d36f6e00a9e8eab | |
| parent | 0d320186cf37ae81eb038a74664440317dddc721 (diff) | |
| download | forums-056584680b4603e93c5e428a1177b09fbea88f30.tar forums-056584680b4603e93c5e428a1177b09fbea88f30.tar.gz forums-056584680b4603e93c5e428a1177b09fbea88f30.tar.bz2 forums-056584680b4603e93c5e428a1177b09fbea88f30.tar.xz forums-056584680b4603e93c5e428a1177b09fbea88f30.zip | |
[ticket/12841] prefix function name with phpbb_
PHPBB3-12841
| -rw-r--r-- | phpBB/includes/functions_acp.php | 2 | ||||
| -rw-r--r-- | tests/functions/insert_config_array_test.php | 2 |
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); } |