diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-05-17 12:22:27 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-05-17 12:22:27 +0200 |
| commit | 30e0b694e606792c772de553ba708d4cc409b416 (patch) | |
| tree | 6d9bc66564aac9af9f075d1f31fafb8cb3011fff /phpBB | |
| parent | 1715619fda2aebd7ebae960e5fcbdf4b24ce4dca (diff) | |
| parent | 37a334c187e382fcbaee717bc3df91ef9ce82e10 (diff) | |
| download | forums-30e0b694e606792c772de553ba708d4cc409b416.tar forums-30e0b694e606792c772de553ba708d4cc409b416.tar.gz forums-30e0b694e606792c772de553ba708d4cc409b416.tar.bz2 forums-30e0b694e606792c772de553ba708d4cc409b416.tar.xz forums-30e0b694e606792c772de553ba708d4cc409b416.zip | |
Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11538
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index cf676a3351..b2b12c1445 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1005,7 +1005,7 @@ if (!function_exists('stripos')) */ function is_absolute($path) { - return ($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/phpBB/install/install_install.php b/phpBB/install/install_install.php index 0575b58d92..4618cff855 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1025,8 +1025,8 @@ class install_install extends module } // Replace backslashes and doubled slashes (could happen on some proxy setups) - $name = str_replace(array('\\', '//', '/install'), '/', $name); - $data['script_path'] = trim(dirname($name)); + $name = str_replace(array('\\', '//'), '/', $name); + $data['script_path'] = trim(dirname(dirname($name))); } foreach ($this->advanced_config_options as $config_key => $vars) |