mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-11 13:58:54 +00:00
Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into develop-olympus
* galaxyAbstractor/ticket/11536: [ticket/11536] Fixed incorrect removal of "install" in script_path
This commit is contained in:
commit
be71701af7
1 changed files with 2 additions and 2 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue