diff options
| author | Matt Friedman <maf675@gmail.com> | 2015-01-30 15:07:37 -0800 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 00:56:47 +0100 |
| commit | 7127d08c8f6e858a42d832aa0eb18c8196875e45 (patch) | |
| tree | 9a3a0837be53675ed31ccbe451ad1a8022dddce1 /phpBB | |
| parent | bb4287ab2dc2a2ce736173a162dfb2e7b9efcde6 (diff) | |
| download | forums-7127d08c8f6e858a42d832aa0eb18c8196875e45.tar forums-7127d08c8f6e858a42d832aa0eb18c8196875e45.tar.gz forums-7127d08c8f6e858a42d832aa0eb18c8196875e45.tar.bz2 forums-7127d08c8f6e858a42d832aa0eb18c8196875e45.tar.xz forums-7127d08c8f6e858a42d832aa0eb18c8196875e45.zip | |
[ticket/13553] Message helper should accept a lang key var
PHPBB3-13553
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 12 |
1 files 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, )); |