diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-16 19:11:55 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-16 19:11:55 +0200 |
| commit | be71701af7856ff036f84ebc2c66a793846c504c (patch) | |
| tree | 3be3b19401484ac803b2d7829831a11a899e5bf8 | |
| parent | 8e3c2ebf8e9d8bf81928cf82df851de84798e7b1 (diff) | |
| parent | 63f11a802447c8641bcb9d645000232dc7181da9 (diff) | |
| download | forums-be71701af7856ff036f84ebc2c66a793846c504c.tar forums-be71701af7856ff036f84ebc2c66a793846c504c.tar.gz forums-be71701af7856ff036f84ebc2c66a793846c504c.tar.bz2 forums-be71701af7856ff036f84ebc2c66a793846c504c.tar.xz forums-be71701af7856ff036f84ebc2c66a793846c504c.zip | |
Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into develop-olympus
* galaxyAbstractor/ticket/11536:
[ticket/11536] Fixed incorrect removal of "install" in script_path
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
1 files changed, 2 insertions, 2 deletions
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) |