From ab4b1afd98b1a9ba532390373b88b518c3d98ece Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 30 Jan 2015 15:19:42 -0800
Subject: [PATCH] [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);