makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12841] prefix function name with phpbb_

Browse source 
PHPBB3-12841
This commit is contained in:
Matt Friedman 2014-07-24 07:44:35 -07:00
parent 0d320186cf
commit 056584680b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_acp.php
View file

@ -668,7 +668,7 @@ function validate_range($value_ary, &$error)
* of the form: array('after' => 'config_name') * of the form: array('after' => 'config_name')
* @return array The array of config display vars * @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)) if (is_array($where) && array_key_exists(current($where), $display_vars))
{ {

2
tests/functions/insert_config_array_test.php
View file

@ -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) public function test_insert_config_array($new_config, $position, $expected)
{ {
$config_array = $this->config_display_vars(); $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); $this->assertSame($expected, $new_config_array);
} }