mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11536] Fixed incorrect removal of "install" in script_path
This commit is contained in:
Andreas Fischer
2013-05-16 19:12:04 +02:00
parent 30f7c52dbb be71701af7
commit a87f9ffea8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/install_install.php
View File

@@ -1022,8 +1022,8 @@ class install_install extends module
} }
// Replace backslashes and doubled slashes (could happen on some proxy setups) // Replace backslashes and doubled slashes (could happen on some proxy setups)
$name = str_replace(array('\\', '//', '/install'), '/', $name); $name = str_replace(array('\\', '//'), '/', $name);
$data['script_path'] = trim(dirname($name)); $data['script_path'] = trim(dirname(dirname($name)));
} }
foreach ($this->advanced_config_options as $config_key => $vars) foreach ($this->advanced_config_options as $config_key => $vars)