diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-16 19:12:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-16 19:12:04 +0200 |
| commit | a87f9ffea8208b36d481027674c11fad9fccbdd1 (patch) | |
| tree | 745c7d19e7b84b5c145fecb9d5400b8863e99f99 | |
| parent | 30f7c52dbb4f6da3ef2203eb7c03d89bfd1faee0 (diff) | |
| parent | be71701af7856ff036f84ebc2c66a793846c504c (diff) | |
| download | forums-a87f9ffea8208b36d481027674c11fad9fccbdd1.tar forums-a87f9ffea8208b36d481027674c11fad9fccbdd1.tar.gz forums-a87f9ffea8208b36d481027674c11fad9fccbdd1.tar.bz2 forums-a87f9ffea8208b36d481027674c11fad9fccbdd1.tar.xz forums-a87f9ffea8208b36d481027674c11fad9fccbdd1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 67e368e34d..f4fd64bc2e 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1022,8 +1022,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) |