diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-02 11:51:16 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-02 11:51:16 +0200 |
| commit | 5d4c7f99529fae3d0e02cf9d6c7e236b11fe455d (patch) | |
| tree | 087b4615c3a992962b13c6d265acf50e1c0d955d /phpBB/phpbb/controller/helper.php | |
| parent | 4a75a8eaa3114c2e9d07c8bedbfd299f26244d9c (diff) | |
| parent | 2ee8b14f86aad8fb78f3fcbbd38e34d724df8a14 (diff) | |
| download | forums-5d4c7f99529fae3d0e02cf9d6c7e236b11fe455d.tar forums-5d4c7f99529fae3d0e02cf9d6c7e236b11fe455d.tar.gz forums-5d4c7f99529fae3d0e02cf9d6c7e236b11fe455d.tar.bz2 forums-5d4c7f99529fae3d0e02cf9d6c7e236b11fe455d.tar.xz forums-5d4c7f99529fae3d0e02cf9d6c7e236b11fe455d.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/11468] Allow controllers to set paramters of page_header()
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 5722951278..e98de0e771 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -78,12 +78,14 @@ class helper * @param string $page_title The title of the page to output * @param int $status_code The status code to be sent to the page header * @param bool $display_online_list Do we display online users list + * @param int $item_id Restrict online users to item id + * @param string $item Restrict online users to a certain session item, e.g. forum for session_forum_id * * @return Response object containing rendered page */ - public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false) + public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false, $item_id = 0, $item = 'forum') { - page_header($page_title, $display_online_list); + page_header($page_title, $display_online_list, $item_id, $item); $this->template->set_filenames(array( 'body' => $template_file, |