diff options
| -rw-r--r-- | includes/common.inc | 5 | ||||
| -rw-r--r-- | index.php | 8 | ||||
| -rw-r--r-- | modules/admin.module | 7 |
3 files changed, 9 insertions, 11 deletions
diff --git a/includes/common.inc b/includes/common.inc index 611135f37..8143693f2 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -913,7 +913,7 @@ function query_print() { print "</pre>"; } -function page_header() { +function drupal_page_header() { if (variable_get("dev_timer", 0)) { timer_start(); } @@ -940,8 +940,7 @@ function page_header() { } } -function page_footer() { - +function drupal_page_footer() { if (variable_get("cache", 0)) { page_set_cache(); } @@ -9,15 +9,15 @@ if (isset($_GET["q"])) { if (isset($mod) && module_hook($mod, "page")) { if ($mod != "admin") { - page_header(); + drupal_page_header(); } module_invoke($mod, "page"); if ($mod != "admin") { - page_footer(); + drupal_page_footer(); } } else { - page_header(); + drupal_page_header(); check_php_setting("magic_quotes_gpc", 0); @@ -29,7 +29,7 @@ else { theme("footer"); } - page_footer(); + drupal_page_footer(); } ?> diff --git a/modules/admin.module b/modules/admin.module index 06649991a..c750fe67a 100644 --- a/modules/admin.module +++ b/modules/admin.module @@ -28,8 +28,7 @@ function admin_page() { global $base_url; if (user_access("access administration pages")) { - page_header(); - + drupal_page_header(); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> <html> @@ -89,12 +88,12 @@ function admin_page() { echo "<h1><a href=\"index.php\">". variable_get("site_name", "drupal") ."</a></h1>"; print menu_tree("admin") ; print "</div>"; - print theme_footer(); + print theme_footer(); ?> </body> </html> <?php - page_footer(); + drupal_page_footer(); } else { print message_access(); |