- Patch by JonBob:

  Phase 2 of the menu system integration project. This unifies the interface
  used by admin and non-admin pages, and deprecates the _page hook in favor of
  explicit callbacks from menu(). Breadcrumbs, titles, and help text go away
  as a result of this patch; they will return in the phase 3 patch, printed
  by the theme.

1 files changed, 13 insertions, 3 deletions

diff --git a/modules/system/system.module b/modules/system/system.module
index 67533f1d6..8e6f3bf4c 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -46,6 +46,12 @@ function system_help($section = "admin/help#system") {
   return $output;
 }
 
+function system_help_page() {
+  print theme("header");
+  print system_help();
+  print theme("footer");
+}
+
 function system_perm() {
   return array("administer site configuration", "access administration pages", "bypass input data check", "create php content");
 }
@@ -76,7 +82,7 @@ function system_link($type) {
         }
       }
       menu("admin/system/filters", t("filters"), "system_admin", 4);
-      menu("admin/system/help", t("help"), "system_help", 9);
+      menu("admin/system/help", t("help"), "system_help_page", 9);
     }
   }
 }
@@ -346,10 +352,14 @@ function system_admin() {
     }
 
     $output .= system_view(arg(2), arg(3));
-    return $output;
+    print theme("header");
+    print $output;
+    print theme("footer");
   }
   else {
-    return message_access();
+    print theme("header");
+    print message_access();
+    print theme("footer");
   }
 }