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:
Andreas Fischer 2013-05-16 19:11:55 +02:00
commit be71701af7

View file

@ -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)