From d8990050a9613532c92b86ad86bfbc58a9c2e5c9 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sat, 16 Sep 2017 17:11:46 +0200 Subject: [PATCH] page: save document root for includes during shutdown Current directory is unavailable in fatal error handler. --- page.inc.php | 7 +++---- page.php | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/page.inc.php b/page.inc.php index 654f37f..c0282ee 100644 --- a/page.inc.php +++ b/page.inc.php @@ -1,11 +1,11 @@ \n"; ob_start(); -include './menu.html'; +include DOCROOT.'menu.html'; $nav = ob_get_clean(); $nav = preg_replace_callback('{(.*?)}', function ($m) { $request = $_SERVER['REQUEST_URI']; @@ -24,10 +24,9 @@ print "\n\n"; print $body; -$footinc = realpath('footer.html'); # cwd lost during shutdown register_shutdown_function(function () { print '\n"; global $User; diff --git a/page.php b/page.php index dc7f012..02886a7 100644 --- a/page.php +++ b/page.php @@ -16,12 +16,14 @@ function getoutput($blocks = []) # custom error handling +define('DOCROOT', getcwd().'/'); + function fail($error) { http_response_code(500); include_once 'page.inc.php'; ob_start(); - require_once './500.html'; + require_once DOCROOT.'500.html'; print getoutput(['debug' => $error]); } -- 2.30.0