aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-11-07 13:49:55 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-11-07 13:49:55 +0100
commit95348c8f6d64302d2d525f2ba1a9408f1510144b (patch)
treea5a982e26e58ec57c64f1dfb6b9d5ad587719e99 /phpBB
parent0e33c8d3d2fe830490771f7d1a357612b297ef96 (diff)
downloadforums-95348c8f6d64302d2d525f2ba1a9408f1510144b.tar
forums-95348c8f6d64302d2d525f2ba1a9408f1510144b.tar.gz
forums-95348c8f6d64302d2d525f2ba1a9408f1510144b.tar.bz2
forums-95348c8f6d64302d2d525f2ba1a9408f1510144b.tar.xz
forums-95348c8f6d64302d2d525f2ba1a9408f1510144b.zip
[ticket/11927] Prefix function with phpbb_
PHPBB3-11927
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_install.php2
-rw-r--r--phpBB/install/install_update.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 25b594cac3..10e9878cc8 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -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
* @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;
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 67420803c9..dc6e57c851 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -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);
$update_list['new'][] = array('filename' => $file, 'custom' => false);