mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-15 05:04:09 +02:00
Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11538
This commit is contained in:
@@ -1005,7 +1005,7 @@ if (!function_exists('stripos'))
|
||||
*/
|
||||
function is_absolute($path)
|
||||
{
|
||||
return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:[/\\\]#i', $path))) ? true : false;
|
||||
return (isset($path[0]) && $path[0] == '/' || preg_match('#^[a-z]:[/\\\]#i', $path)) ? true : false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user