From 95348c8f6d64302d2d525f2ba1a9408f1510144b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Nov 2013 13:49:55 +0100
Subject: [PATCH] [ticket/11927] Prefix function with phpbb_

PHPBB3-11927
---
 phpBB/includes/functions_install.php                       | 2 +-
 phpBB/install/install_update.php                           | 2 +-
 tests/functions_install/ignore_new_file_on_update_test.php | 2 +-
 3 files changed, 3 insertions(+), 3 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);
diff --git a/tests/functions_install/ignore_new_file_on_update_test.php b/tests/functions_install/ignore_new_file_on_update_test.php
index 0c05cc6907..ae1dde96f7 100644
--- a/tests/functions_install/ignore_new_file_on_update_test.php
+++ b/tests/functions_install/ignore_new_file_on_update_test.php
@@ -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)
 	{
 		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));
 	}
 }