diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-06 18:01:31 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-06 21:10:42 +0100 |
| commit | 62a261930073837d10993fae81202517bc04e122 (patch) | |
| tree | 862c9d094a3e116aac1634a42bcf981aaddd5ebd /phpBB/phpbb/controller/helper.php | |
| parent | ad23b2330c765ebbafe96ba3f68543284fbed456 (diff) | |
| download | forums-62a261930073837d10993fae81202517bc04e122.tar forums-62a261930073837d10993fae81202517bc04e122.tar.gz forums-62a261930073837d10993fae81202517bc04e122.tar.bz2 forums-62a261930073837d10993fae81202517bc04e122.tar.xz forums-62a261930073837d10993fae81202517bc04e122.zip | |
[ticket/14483] Do not send headers by default on access via controller
PHPBB3-14483
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 79378c2434..08a63639b9 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -102,12 +102,13 @@ class helper * @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 + * @param bool $send_headers Whether headers should be sent by page_header(). Defaults to false for controllers. * * @return Response object containing rendered page */ - public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false, $item_id = 0, $item = 'forum') + public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false, $item_id = 0, $item = 'forum', $send_headers = false) { - page_header($page_title, $display_online_list, $item_id, $item); + page_header($page_title, $display_online_list, $item_id, $item, $send_headers); $this->template->set_filenames(array( 'body' => $template_file, @@ -115,7 +116,9 @@ class helper page_footer(true, false, false); - return new Response($this->template->assign_display('body'), $status_code); + $headers = !empty($this->user->data['is_bot']) ? array('X-PHPBB-IS-BOT' => 'yes') : array(); + + return new Response($this->template->assign_display('body'), $status_code, $headers); } /** |