X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/772961fd4e9be46ad340cad1e55ee5f28cc5b968..467fdea52c27dcf01e79cb96068134403afff660:/page.inc.php?ds=inline

diff --git a/page.inc.php b/page.inc.php
index 137d266..afaa970 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -1,11 +1,12 @@
 <?php
-$body = getoutput(@$Place);
+$body = $Page->render();
 
 include_once 'head.inc.php';
 
 print "<header>\n";
 ob_start();
-include 'menu.inc.html';
+$menu = new ArchiveArticle('menu.inc.html');
+print $menu->raw;
 ob_start();
 if ($User and property_exists($User, 'login') and $User->login) {
 	print '<div class="login"><p>';
@@ -29,7 +30,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'];