mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[ticket/11927] Prefix function with phpbb_
PHPBB3-11927
This commit is contained in:
parent
0e33c8d3d2
commit
95348c8f6d
3 changed files with 3 additions and 3 deletions
|
@ -546,7 +546,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test
|
||||||
* @param string $file File including path from phpbb root
|
* @param string $file File including path from phpbb root
|
||||||
* @return bool Should we ignore the new file or add it to the board?
|
* @return bool Should we ignore the new file or add it to the board?
|
||||||
*/
|
*/
|
||||||
function ignore_new_file_on_update($phpbb_root_path, $file)
|
function phpbb_ignore_new_file_on_update($phpbb_root_path, $file)
|
||||||
{
|
{
|
||||||
$ignore_new_file = false;
|
$ignore_new_file = false;
|
||||||
|
|
||||||
|
|
|
@ -1311,7 +1311,7 @@ class install_update extends module
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
if (!ignore_new_file_on_update($phpbb_root_path, $file))
|
if (!phpbb_ignore_new_file_on_update($phpbb_root_path, $file))
|
||||||
{
|
{
|
||||||
$this->get_custom_info($update_list['new'], $file);
|
$this->get_custom_info($update_list['new'], $file);
|
||||||
$update_list['new'][] = array('filename' => $file, 'custom' => false);
|
$update_list['new'][] = array('filename' => $file, 'custom' => false);
|
||||||
|
|
|
@ -34,6 +34,6 @@ class phpbb_functions_install_ignore_new_file_on_update_test extends phpbb_test_
|
||||||
public function test_ignore_new_file_on_update($file, $expected)
|
public function test_ignore_new_file_on_update($file, $expected)
|
||||||
{
|
{
|
||||||
global $phpbb_root_path;
|
global $phpbb_root_path;
|
||||||
$this->assertEquals($expected, ignore_new_file_on_update($phpbb_root_path, $file));
|
$this->assertEquals($expected, phpbb_ignore_new_file_on_update($phpbb_root_path, $file));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue