diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2015-01-30 13:10:38 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2015-01-30 13:10:38 +0530 |
| commit | ab07be81573c155d46dcb739a3811b1e958139a5 (patch) | |
| tree | 448ebb7f5a227f84444c9e59b27cd00d53dae4db /phpBB/phpbb/controller | |
| parent | 05d8264de6e7aea7c6f25f0fbd13f5c33f8842c6 (diff) | |
| parent | c130165bfa06412752836e8715602836c18874d5 (diff) | |
| download | forums-ab07be81573c155d46dcb739a3811b1e958139a5.tar forums-ab07be81573c155d46dcb739a3811b1e958139a5.tar.gz forums-ab07be81573c155d46dcb739a3811b1e958139a5.tar.bz2 forums-ab07be81573c155d46dcb739a3811b1e958139a5.tar.xz forums-ab07be81573c155d46dcb739a3811b1e958139a5.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 | 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); |