From 02a9264780f3896cf88b9d793dbf8831aa54e029 Mon Sep 17 00:00:00 2001 From: Mate Bartus Date: Thu, 3 Dec 2015 20:31:49 +0100 Subject: [PATCH] [ticket/14269] Fix comments and language var names PHPBB3-14269 --- phpBB/language/en/install.php | 4 ++-- phpBB/phpbb/install/controller/install.php | 2 +- phpBB/phpbb/install/controller/update.php | 2 +- phpBB/phpbb/install/event/kernel_exception_subscriber.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 2341a12842..85592bbc0d 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -83,8 +83,8 @@ $lang = array_merge($lang, array( 'ACP_LINK' => 'Take me to the ACP', - 'INSTALL_PHPBB_IS_ALREADY_INSTALLED' => 'phpBB is already installed.', - 'INSTALL_PHPBB_IS_NOT_INSTALLED' => 'phpBB is not installed yet.' + 'INSTALL_PHPBB_INSTALLED' => 'phpBB is already installed.', + 'INSTALL_PHPBB_NOT_INSTALLED' => 'phpBB is not installed yet.' )); // Requirements translation diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php index 0fd4e8897c..baa4e4807a 100644 --- a/phpBB/phpbb/install/controller/install.php +++ b/phpBB/phpbb/install/controller/install.php @@ -105,7 +105,7 @@ class install { if ($this->install_helper->is_phpbb_installed()) { - throw new http_exception(404, 'INSTALL_PHPBB_IS_ALREADY_INSTALLED'); + throw new http_exception(404, 'INSTALL_PHPBB_INSTALLED'); } $this->template->assign_vars(array( diff --git a/phpBB/phpbb/install/controller/update.php b/phpBB/phpbb/install/controller/update.php index 6a4341710a..8ecd8b3cb8 100644 --- a/phpBB/phpbb/install/controller/update.php +++ b/phpBB/phpbb/install/controller/update.php @@ -103,7 +103,7 @@ class update { if (!$this->install_helper->is_phpbb_installed()) { - throw new http_exception(404, 'INSTALL_PHPBB_IS_NOT_INSTALLED'); + throw new http_exception(404, 'INSTALL_PHPBB_NOT_INSTALLED'); } $this->template->assign_vars(array( diff --git a/phpBB/phpbb/install/event/kernel_exception_subscriber.php b/phpBB/phpbb/install/event/kernel_exception_subscriber.php index 2e6f9ca74d..c2960cb13c 100644 --- a/phpBB/phpbb/install/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/install/event/kernel_exception_subscriber.php @@ -112,9 +112,9 @@ class kernel_exception_subscriber implements EventSubscriberInterface } /** - * Returns an array of the events the object is subscribed to + * Returns an array of events the object is subscribed to * - * @return array Array of the events the object is subscribed to + * @return array Array of events the object is subscribed to */ static public function getSubscribedEvents() {