mirror of
https://github.com/phpbb/phpbb.git
synced 2025-01-18 22:58:10 +01:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11536] Fixed incorrect removal of "install" in script_path
This commit is contained in:
commit
a87f9ffea8
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user