diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2015-01-29 19:08:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-29 19:08:32 +0100 |
| commit | afe99f90506153c22d5d3791c3f5467938e835cf (patch) | |
| tree | bb477c1b2d5c142d52b2bad4616c582775ec09e7 /phpBB/phpbb/controller | |
| parent | [prep-release-3.1.3] Add changelog for 3.1.3-RC1 (diff) | |
| download | phpbb-afe99f90506153c22d5d3791c3f5467938e835cf.tar.gz phpbb-afe99f90506153c22d5d3791c3f5467938e835cf.tar.bz2 phpbb-afe99f90506153c22d5d3791c3f5467938e835cf.zip | |
[ticket/13553] Add a method to the controller helper to display a message
PHPBB3-13553
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 7ee90b10ba..85ecd87c5f 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -189,9 +189,24 @@ class helper */ public function error($message, $code = 500) { + return $this->message($message, false, $code); + } + + /** + * Output a message + * + * 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 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) + { $this->template->assign_vars(array( 'MESSAGE_TEXT' => $message, - 'MESSAGE_TITLE' => $this->user->lang('INFORMATION'), + 'MESSAGE_TITLE' => ($title === false) ? $this->user->lang('INFORMATION') : $title, )); return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code); |