From fa949c0747fa001c345a139abb9889a18ba2563a Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 28 Oct 2019 05:02:49 +0100
Subject: [PATCH] page: silence object warnings on missing pages

---
 page.inc.php | 4 ++--
 page.php     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/page.inc.php b/page.inc.php
index b7a7e77..7a54bf7 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -7,7 +7,7 @@ print "<header>\n";
 ob_start();
 include 'menu.inc.html';
 ob_start();
-if ($User) {
+if (!empty($User)) {
 	print '<div class="login"><p>';
 	printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User->login);
 	if ($User->admin("edit $Page$Args")) {
@@ -44,7 +44,7 @@ register_shutdown_function(function () {
 	print "</footer>\n";
 
 	global $User, $Page, $Args;
-	if ($User and $User->admin("edit $Page$Args")) {
+	if (!empty($User) and $User->admin("edit $Page$Args")) {
 		$ckesrc = '/lib/ckeditor'; # local install
 		if (!file_exists(DOCROOT . $ckesrc)) {
 			$ckesrc = '//cdn.ckeditor.com/4.7.3/full-all'; # remote fallback
diff --git a/page.php b/page.php
index f02544b..1488f1c 100644
--- a/page.php
+++ b/page.php
@@ -84,6 +84,10 @@ set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 function fail($error)
 {
 	http_response_code(500);
+	if (!isset($Article)) {
+		$Article = new ArchiveArticle(NULL);
+		$Article->title = 'Fout';
+	}
 	include_once 'page.inc.php';
 	ob_start();
 	require_once '500.inc.html';
-- 
2.30.0