widget/page: apply nested placeholders

[minimedit.git] / page.inc.php

diff --git a/page.inc.php b/page.inc.php
index 137d266267fab1905b74492b3e556e3b77722684..afaa970868493fc3f509966f11576e47a3e3c64b 100644 (file)
--- 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'];