diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 00:57:25 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 00:57:25 +0100 |
| commit | 67478a0f94611ba642e31549b52d83f04a4c8028 (patch) | |
| tree | c59ec1eb6f5f1503311df1110f2c1e746b1f0421 /phpBB/phpbb/controller | |
| parent | b16854ab8c0199da93d88491c4c0898d7a043c09 (diff) | |
| parent | e72c1540cbe0aded6325371f5f7fae4ca6c8449d (diff) | |
| download | forums-67478a0f94611ba642e31549b52d83f04a4c8028.tar forums-67478a0f94611ba642e31549b52d83f04a4c8028.tar.gz forums-67478a0f94611ba642e31549b52d83f04a4c8028.tar.bz2 forums-67478a0f94611ba642e31549b52d83f04a4c8028.tar.xz forums-67478a0f94611ba642e31549b52d83f04a4c8028.zip | |
Merge branch 'prep-release-3.1.3' into develop-ascraeus
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 85ecd87c5f..c6c470e91b 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(), 'INFORMATION', $code); } /** @@ -197,19 +197,21 @@ 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 $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, $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' => $message, - 'MESSAGE_TITLE' => ($title === false) ? $this->user->lang('INFORMATION') : $title, + 'MESSAGE_TEXT' => call_user_func_array(array($this->user, 'lang'), $parameters), + '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); } /** |