[ticket/14039] Fix inclusion logic in update helper

PHPBB3-14039
This commit is contained in:
Mate Bartus 2015-10-19 01:19:31 +02:00
parent 2f8ef80d92
commit de729110c8

View file

@ -72,16 +72,11 @@ class update_helper
*/ */
public function include_file($filename) public function include_file($filename)
{ {
if (!is_file($this->phpbb_root_path . $filename))
{
return;
}
if (is_file($this->path_to_new_files . $filename)) if (is_file($this->path_to_new_files . $filename))
{ {
include_once($this->path_to_new_files . $filename); include_once($this->path_to_new_files . $filename);
} }
else else if (is_file($this->phpbb_root_path . $filename))
{ {
include_once($this->phpbb_root_path . $filename); include_once($this->phpbb_root_path . $filename);
} }