X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/10c5940d15b49f8656c3c1b384f80f4c619d3d82..b3aec6cf1cd18493d44cf68d88c8f55b6a417f9c:/page.php

diff --git a/page.php b/page.php
index f5e9749..f02544b 100644
--- a/page.php
+++ b/page.php
@@ -163,42 +163,33 @@ elseif ($User and $User->admin("edit $Page$Args")) {
 	$staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
 }
 
-# load static contents
+# prepare page contents
 
 require_once('article.inc.php');
 $Article = new ArchiveArticle($staticpage);
 
 ob_start(); # page body
-ob_start(); # inner html
-print '<div class="static">'."\n\n";
-
-$found = FALSE;
-if (isset($Article->raw)) {
-	print $Article->raw;
-	$found = 1;
-}
-
-print "</div>\n\n";
-
-# execute dynamic code
-
-$Place = [];
-
-if ($Page) {
-	$found |= require "./$Page/index.php";
-}
-
-$Place += [
+$Place = [
 	'user'  => $User ? $User->login : '',
 	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
-# global html
+if (isset($Article->raw)) {
+	$Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
+}
 
-if (!$found) {
-	# no resulting output
-	http_response_code(404);
-	@require '404.inc.html';
+# output dynamic and/or static html
+
+if (!$Page or require("./$Page/index.php")) {
+	# static contents
+	if (isset($Article->raw)) {
+		print $Article->raw;
+	}
+	else {
+		# no resulting output
+		http_response_code(404);
+		@require '404.inc.html';
+	}
 }
 
 include_once 'page.inc.php';