diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-28 17:07:16 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-28 17:07:16 +0100 |
| commit | 6af942740cb534e4db6ad12bef1d1e9f297fd84e (patch) | |
| tree | ede60614efe73bd7d93c3f74f2d911a58e28bbc2 /phpBB/phpbb | |
| parent | c256d7a88d617116e540fb4881605375f4f3e307 (diff) | |
| parent | 76f7ef5c837345c80f0dcefb6787f23a9c0159e7 (diff) | |
| download | forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar.gz forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar.bz2 forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar.xz forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.zip | |
Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeus
* geetakshi/ticket/11360:
[ticket/11360] Updating default value of $display_online_list
[ticket/11360] Avoiding online list where not required
[ticket/11360] Change second parameter in page_header function
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 10fdbb1375..54c30c93fc 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -77,9 +77,9 @@ class helper * @param int $status_code The status code to be sent to the page header * @return Response object containing rendered page */ - public function render($template_file, $page_title = '', $status_code = 200) + public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false) { - page_header($page_title); + page_header($page_title, $display_online_list); $this->template->set_filenames(array( 'body' => $template_file, |