summaryrefslogtreecommitdiff
path: root/app/Controller/AjaxController.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2015-05-09 16:42:57 +0100
committerGreg Roach <fisharebest@gmail.com>2015-05-09 16:42:57 +0100
commit00ba7e55d22f3a09664848649b4b757c3972804b (patch)
tree37e4f8b15892d21a9ade8f0176fd29832e308a00 /app/Controller/AjaxController.php
parentbf2e42891b79bec1c7710499726dcdac7b34275c (diff)
downloadwebtrees-00ba7e55d22f3a09664848649b4b757c3972804b.tar.gz
webtrees-00ba7e55d22f3a09664848649b4b757c3972804b.tar.bz2
webtrees-00ba7e55d22f3a09664848649b4b757c3972804b.zip
The PHP shutdown sequence is undefined, so do not rely on it
Diffstat (limited to 'app/Controller/AjaxController.php')
-rw-r--r--app/Controller/AjaxController.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/Controller/AjaxController.php b/app/Controller/AjaxController.php
index b39dd9230b..b8f436bdf8 100644
--- a/app/Controller/AjaxController.php
+++ b/app/Controller/AjaxController.php
@@ -27,16 +27,18 @@ class AjaxController extends BaseController {
public function pageHeader() {
// Ajax responses are always UTF8
header('Content-Type: text/html; charset=UTF-8');
- $this->page_header = true;
+ // We've displayed the header - display the footer automatically
+ register_shutdown_function(array($this, 'pageFooter'));
+
return $this;
}
/**
- * @return string
+ * @return void
*/
public function pageFooter() {
// Ajax responses may have Javascript
- return $this->getJavascript();
+ echo $this->getJavascript();
}
/**