mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 07:35:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source
This commit is contained in:
Joas Schilling 2015-01-31 00:57:32 +01:00
commit c14cf0457d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/phpbb/controller/helper.php
View File

@ -192,7 +192,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(), 'INFORMATION', $code);
} }
/** /**
@ -200,19 +200,21 @@ 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 $title Title for the message (must be a language variable)
* @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 = 'INFORMATION', $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' => $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);
} }
/** /**