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

[ticket/10848] Add phpbb_ prefix.

Browse source 
PHPBB3-10848
This commit is contained in:
Oleg Pudeyev 2012-10-17 15:13:35 -04:00
parent c630480ca1
commit bb09cd9c8e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/common.php
View file

@ -45,7 +45,7 @@ if (!defined('PHPBB_INSTALLED'))
$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path); $script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
// Eliminate . and .. from the path // Eliminate . and .. from the path
require($phpbb_root_path . 'includes/functions.' . $phpEx); 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; $url = (($secure) ? 'https://' : 'http://') . $server_name;

2
phpBB/includes/functions.php
View file

@ -1182,7 +1182,7 @@ else
* @param string $path Path to clean * @param string $path Path to clean
* @return string Cleaned path * @return string Cleaned path
*/ */
function clean_path($path) function phpbb_clean_path($path)
{ {
$exploded = explode('/', $path); $exploded = explode('/', $path);
$filtered = array(); $filtered = array();

2
tests/functions/clean_path_test.php
View file

@ -37,7 +37,7 @@ class phpbb_clean_path_test extends phpbb_test_case
*/ */
public function test_clean_path($input, $expected) public function test_clean_path($input, $expected)
{ {
$output = clean_path($input); $output = phpbb_clean_path($input);
$this->assertEquals($expected, $output); $this->assertEquals($expected, $output);
} }