mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-22 17:41:24 +02:00
Code Issues Releases Wiki Activity

[ticket/16688] Do not restore current working dir before json file restoring

Browse Source 
PHPBB3-16688
This commit is contained in:
rxu
2021-12-19 16:57:40 +07:00
parent d4d26987e5
commit 6404ed2502
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/composer/installer.php
View File

@@ -185,16 +185,16 @@ class installer
} }
catch (\Exception $e) catch (\Exception $e)
{ {
$this->restore_cwd();
$this->restore_ext_json_file(); $this->restore_ext_json_file();
$this->restore_cwd();
throw new runtime_exception('COMPOSER_CANNOT_INSTALL', [], $e); throw new runtime_exception('COMPOSER_CANNOT_INSTALL', [], $e);
} }
if ($result !== 0) if ($result !== 0)
{ {
$this->restore_cwd();
$this->restore_ext_json_file(); $this->restore_ext_json_file();
$this->restore_cwd();
throw new runtime_exception($io->get_composer_error(), []); throw new runtime_exception($io->get_composer_error(), []);
} }