makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13553] Message helper should accept a lang key var

Browse source 
PHPBB3-13553
This commit is contained in:
Matt Friedman 2015-01-30 15:07:37 -08:00 • committed by Joas Schilling
parent bb4287ab2d
commit 7127d08c8f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/phpbb/controller/helper.php
View file

@ -189,7 +189,7 @@ class helper
*/ */
public function error($message, $code = 500) 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 * In case of an error, please throw an exception instead
* *
* @param string $message The message to display * @param string $message The message to display (must be a language variable)
* @param string|false $title Title for the message * @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.) * @param int $code The HTTP status code (e.g. 404, 500, 503, etc.)
* @return Response A Response instance * @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( $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, 'MESSAGE_TITLE' => ($title === false) ? $this->user->lang('INFORMATION') : $title,
)); ));