- Emit the menu after the actual content; this makes it possible to rebuild

  the menu when some action changed the system table.

1 files changed, 9 insertions, 18 deletions

diff --git a/modules/admin.module b/modules/admin.module
index 3b48e3e21..9fb1a34bb 100644
--- a/modules/admin.module
+++ b/modules/admin.module
@@ -16,7 +16,7 @@ function admin_link($type) {
 }
 
 function sitemap_callback() {
-  return menu_map('admin');
+  return menu_map("admin");
 }
 
 function admin_admin() {
@@ -47,17 +47,6 @@ function admin_page() {
         module_invoke_all("link", "admin");
 
         /*
-        ** Menu:
-        */
-
-        print "<div id=\"menu\">";
-        echo "<h1><a href=\"index.php\">". variable_get("site_name", "drupal") ."</a></h1>";
-        //print menu_tree('admin') ;
-        print menu_tree('admin') ;
-
-        print "</div>";
-
-        /*
         ** Body:
         */
 
@@ -71,12 +60,6 @@ function admin_page() {
           print "<h2>". t("Administration") ."</h2>";
         }
 
-        /*
-        if ($menu = menu_menu()) {
-          print "$menu<br />";
-        }
-        */
-
         if ($help = menu_help()) {
           print "<small>$help</small>";
         }
@@ -94,6 +77,14 @@ function admin_page() {
 
         print "</div>";
 
+        /*
+        ** Menu:
+        */
+
+        print "<div id=\"menu\">";
+        echo "<h1><a href=\"index.php\">". variable_get("site_name", "drupal") ."</a></h1>";
+        print menu_tree("admin") ;
+        print "</div>";
       ?>
     </body>
    </html>