diff options
| author | Matt Friedman <maf675@gmail.com> | 2015-01-30 15:19:42 -0800 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 00:56:54 +0100 |
| commit | ab4b1afd98b1a9ba532390373b88b518c3d98ece (patch) | |
| tree | 44fcc5e1cfa03fbd81bfe44c777eb3721747e64d /phpBB/phpbb/controller | |
| parent | 7127d08c8f6e858a42d832aa0eb18c8196875e45 (diff) | |
| download | forums-ab4b1afd98b1a9ba532390373b88b518c3d98ece.tar forums-ab4b1afd98b1a9ba532390373b88b518c3d98ece.tar.gz forums-ab4b1afd98b1a9ba532390373b88b518c3d98ece.tar.bz2 forums-ab4b1afd98b1a9ba532390373b88b518c3d98ece.tar.xz forums-ab4b1afd98b1a9ba532390373b88b518c3d98ece.zip | |
[ticket/13553] Make title var accept a lang key var
PHPBB3-13553
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 8 |
1 files 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); |