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 /phpBB/includes | |
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
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 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; } /** |