From 7127d08c8f6e858a42d832aa0eb18c8196875e45 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 30 Jan 2015 15:07:37 -0800 Subject: [PATCH 1/3] [ticket/13553] Message helper should accept a lang key var PHPBB3-13553 --- phpBB/phpbb/controller/helper.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 85ecd87c5f..d135f487e0 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -189,7 +189,7 @@ class helper */ public function error($message, $code = 500) { - return $this->message($message, false, $code); + return $this->message($message, array(), false, $code); } /** @@ -197,15 +197,17 @@ class helper * * In case of an error, please throw an exception instead * - * @param string $message The message to display - * @param string|false $title Title for the message + * @param string $message The message to display (must be a language variable) + * @param array $parameters The parameters to use with the language var + * @param string|bool $title Title for the message * @param int $code The HTTP status code (e.g. 404, 500, 503, etc.) * @return Response A Response instance */ - public function message($message, $title = false, $code = 200) + public function message($message, array $parameters = array(), $title = false, $code = 200) { + array_unshift($parameters, $message); $this->template->assign_vars(array( - 'MESSAGE_TEXT' => $message, + 'MESSAGE_TEXT' => call_user_func_array(array($this->user, 'lang'), $parameters), 'MESSAGE_TITLE' => ($title === false) ? $this->user->lang('INFORMATION') : $title, )); From ab4b1afd98b1a9ba532390373b88b518c3d98ece Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 30 Jan 2015 15:19:42 -0800 Subject: [PATCH 2/3] [ticket/13553] Make title var accept a lang key var PHPBB3-13553 --- phpBB/phpbb/controller/helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index d135f487e0..8b0efae08a 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -189,7 +189,7 @@ class helper */ public function error($message, $code = 500) { - return $this->message($message, array(), false, $code); + return $this->message($message, array(), 'INFORMATION', $code); } /** @@ -199,16 +199,16 @@ class helper * * @param string $message The message to display (must be a language variable) * @param array $parameters The parameters to use with the language var - * @param string|bool $title Title for the message + * @param string $title Title for the message (must be a language variable) * @param int $code The HTTP status code (e.g. 404, 500, 503, etc.) * @return Response A Response instance */ - public function message($message, array $parameters = array(), $title = false, $code = 200) + public function message($message, array $parameters = array(), $title = 'INFORMATION', $code = 200) { array_unshift($parameters, $message); $this->template->assign_vars(array( 'MESSAGE_TEXT' => call_user_func_array(array($this->user, 'lang'), $parameters), - 'MESSAGE_TITLE' => ($title === false) ? $this->user->lang('INFORMATION') : $title, + 'MESSAGE_TITLE' => $this->user->lang($title), )); return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code); From e6bbde2bffc4ff90de1b754d3682bc7f1ca1d67c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 30 Jan 2015 15:28:25 -0800 Subject: [PATCH 3/3] [ticket/13553] Use defined title value in page headers too PHPBB3-13553 --- phpBB/phpbb/controller/helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 8b0efae08a..c6c470e91b 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -211,7 +211,7 @@ class helper 'MESSAGE_TITLE' => $this->user->lang($title), )); - return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code); + return $this->render('message_body.html', $this->user->lang($title), $code); } /**