diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-16 17:46:19 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-16 17:46:19 +0200 |
| commit | 30f7c52dbb4f6da3ef2203eb7c03d89bfd1faee0 (patch) | |
| tree | 8644b6187220c94213991568b602e257d89e4e48 | |
| parent | fad37dd383258d90e215256a63b0412f250a76c8 (diff) | |
| parent | 8e3c2ebf8e9d8bf81928cf82df851de84798e7b1 (diff) | |
| download | forums-30f7c52dbb4f6da3ef2203eb7c03d89bfd1faee0.tar forums-30f7c52dbb4f6da3ef2203eb7c03d89bfd1faee0.tar.gz forums-30f7c52dbb4f6da3ef2203eb7c03d89bfd1faee0.tar.bz2 forums-30f7c52dbb4f6da3ef2203eb7c03d89bfd1faee0.tar.xz forums-30f7c52dbb4f6da3ef2203eb7c03d89bfd1faee0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | tests/functions/is_absolute_test.php | 29 |
2 files changed, 26 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0217aedb54..b087e1298b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -846,7 +846,7 @@ function phpbb_is_writable($file) */ function phpbb_is_absolute($path) { - return (isset($path[0]) && $path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:[/\\\]#i', $path))) ? true : false; + return (isset($path[0]) && $path[0] == '/' || preg_match('#^[a-z]:[/\\\]#i', $path)) ? true : false; } /** diff --git a/tests/functions/is_absolute_test.php b/tests/functions/is_absolute_test.php index ada4d7b4de..6d26793d82 100644 --- a/tests/functions/is_absolute_test.php +++ b/tests/functions/is_absolute_test.php @@ -14,14 +14,35 @@ class phpbb_functions_is_absolute_test extends phpbb_test_case static public function is_absolute_data() { return array( + // Empty array('', false), + + // Absolute unix style array('/etc/phpbb', true), + // Unix does not support \ so that is not an absolute path + array('\etc\phpbb', false), + + // Absolute windows style + array('c:\windows', true), + array('C:\Windows', true), + array('c:/windows', true), + array('C:/Windows', true), + + // Executable array('etc/phpbb', false), + array('explorer.exe', false), + + // Relative subdir + array('Windows\System32', false), + array('Windows\System32\explorer.exe', false), + array('Windows/System32', false), + array('Windows/System32/explorer.exe', false), - // Until we got DIRECTORY_SEPARATOR replaced in that function, - // test results vary on OS. - array('c:\windows', DIRECTORY_SEPARATOR == '\\'), - array('C:\Windows', DIRECTORY_SEPARATOR == '\\'), + // Relative updir + array('..\Windows\System32', false), + array('..\Windows\System32\explorer.exe', false), + array('../Windows/System32', false), + array('../Windows/System32/explorer.exe', false), ); } |