diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-17 15:13:35 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-17 15:13:35 -0400 |
| commit | bb09cd9c8e76ac3af848d09db8ea1928dab66158 (patch) | |
| tree | 8b8bc514928cab347f5965ce1c81b8c367d0a6e0 | |
| parent | c630480ca1a426cb0897be35626baac2694fccf5 (diff) | |
| download | forums-bb09cd9c8e76ac3af848d09db8ea1928dab66158.tar forums-bb09cd9c8e76ac3af848d09db8ea1928dab66158.tar.gz forums-bb09cd9c8e76ac3af848d09db8ea1928dab66158.tar.bz2 forums-bb09cd9c8e76ac3af848d09db8ea1928dab66158.tar.xz forums-bb09cd9c8e76ac3af848d09db8ea1928dab66158.zip | |
[ticket/10848] Add phpbb_ prefix.
PHPBB3-10848
| -rw-r--r-- | phpBB/common.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | tests/functions/clean_path_test.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index bdb33707cc..5849d48453 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -45,7 +45,7 @@ if (!defined('PHPBB_INSTALLED')) $script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path); // Eliminate . and .. from the path require($phpbb_root_path . 'includes/functions.' . $phpEx); - $script_path = clean_path($script_path); + $script_path = phpbb_clean_path($script_path); $url = (($secure) ? 'https://' : 'http://') . $server_name; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 2391b45038..65d8be32ad 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1182,7 +1182,7 @@ else * @param string $path Path to clean * @return string Cleaned path */ -function clean_path($path) +function phpbb_clean_path($path) { $exploded = explode('/', $path); $filtered = array(); diff --git a/tests/functions/clean_path_test.php b/tests/functions/clean_path_test.php index 4c8fe54909..bcbe9838d9 100644 --- a/tests/functions/clean_path_test.php +++ b/tests/functions/clean_path_test.php @@ -37,7 +37,7 @@ class phpbb_clean_path_test extends phpbb_test_case */ public function test_clean_path($input, $expected) { - $output = clean_path($input); + $output = phpbb_clean_path($input); $this->assertEquals($expected, $output); } |