page: ignore output buffer in article render

[minimedit.git] / page.inc.php

diff --git a/page.inc.php b/page.inc.php
index 137d266267fab1905b74492b3e556e3b77722684..8eba91bdac04d80ccd3f8566197e67fe476cbee8 100644 (file)
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,11 +1,8 @@
 <?php
-$body = getoutput(@$Place);
-
 include_once 'head.inc.php';
 
 print "<header>\n";
-ob_start();
-include 'menu.inc.html';
+$menu = new ArchiveArticle('menu.inc.html');
 ob_start();
 if ($User and property_exists($User, 'login') and $User->login) {
        print '<div class="login"><p>';
@@ -29,7 +26,8 @@ if ($User and property_exists($User, 'login') and $User->login) {
        }
        print "</p></div>\n";
 }
-$nav = getoutput(['login' => ob_get_clean()]);
+$menu->place['login'] = ob_get_clean();
+$nav = $menu->render();
 
 $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
        $request = $_SERVER['REQUEST_URI'];
@@ -39,7 +37,7 @@ $nav = preg_replace_callback('{<a href="([^"]+)">(.*?)</a>}', function ($m) {
 print $nav;
 print "</header>\n\n";
 
-print $body;
+print $Page->render();
 
 register_shutdown_function(function () {
        print '<footer>';