diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-11-04 14:00:59 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-11-27 14:50:21 +0100 |
| commit | 93b37b24c2d546a2bc80830508d64338a24f9afa (patch) | |
| tree | 6f52cd9cd8aedc22034c549f3f8c14defb1d543e /phpBB/phpbb/install/controller | |
| parent | 1316fe208482d0a56ce6e54b79a1a00ae05d32ce (diff) | |
| download | forums-93b37b24c2d546a2bc80830508d64338a24f9afa.tar forums-93b37b24c2d546a2bc80830508d64338a24f9afa.tar.gz forums-93b37b24c2d546a2bc80830508d64338a24f9afa.tar.bz2 forums-93b37b24c2d546a2bc80830508d64338a24f9afa.tar.xz forums-93b37b24c2d546a2bc80830508d64338a24f9afa.zip | |
[ticket/14269] Use http_exceptions in the installer instead of die()
PHPBB3-14269
Diffstat (limited to 'phpBB/phpbb/install/controller')
| -rw-r--r-- | phpBB/phpbb/install/controller/install.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/install/controller/update.php | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php index 8d5ff95958..0fd4e8897c 100644 --- a/phpBB/phpbb/install/controller/install.php +++ b/phpBB/phpbb/install/controller/install.php @@ -13,6 +13,7 @@ namespace phpbb\install\controller; +use phpbb\exception\http_exception; use phpbb\install\helper\install_helper; use phpbb\install\helper\navigation\navigation_provider; use Symfony\Component\HttpFoundation\StreamedResponse; @@ -97,12 +98,14 @@ class install * Controller logic * * @return Response|StreamedResponse + * + * @throws http_exception When phpBB is already installed */ public function handle() { if ($this->install_helper->is_phpbb_installed()) { - die ('phpBB is already installed'); + throw new http_exception(404, 'INSTALL_PHPBB_IS_ALREADY_INSTALLED'); } $this->template->assign_vars(array( diff --git a/phpBB/phpbb/install/controller/update.php b/phpBB/phpbb/install/controller/update.php index 5212ba7f26..6a4341710a 100644 --- a/phpBB/phpbb/install/controller/update.php +++ b/phpBB/phpbb/install/controller/update.php @@ -13,6 +13,7 @@ namespace phpbb\install\controller; +use phpbb\exception\http_exception; use phpbb\install\helper\install_helper; use phpbb\install\helper\iohandler\factory; use phpbb\install\helper\navigation\navigation_provider; @@ -93,12 +94,16 @@ class update /** * Controller entry point + * + * @return Response|StreamedResponse + * + * @throws http_exception When phpBB is not installed */ public function handle() { if (!$this->install_helper->is_phpbb_installed()) { - die ('phpBB is not installed'); + throw new http_exception(404, 'INSTALL_PHPBB_IS_NOT_INSTALLED'); } $this->template->assign_vars(array( |