From 3c1095b79c6dfad235aceb2c7e202b227131522d Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 29 Aug 2008 06:36:31 +0000
Subject: [PATCH] Fix position of admin notices, includes patch by
 caesarsgrunt, fixes #7619

git-svn-id: http://svn.automattic.com/wordpress/trunk@8769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php |  7 +++++--
 wp-admin/menu-header.php  | 13 -------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index c2620335b9..e8772cbf39 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -133,10 +133,13 @@ if ( ! $is_opera ) {
 
 <?php
 require(ABSPATH . 'wp-admin/menu-header.php');
+?>
+<div id="wpbody">
+<div id="wpbody-content">
+<?php
+do_action('admin_notices');
 
 if ( $parent_file == 'options-general.php' ) {
 	require(ABSPATH . 'wp-admin/options-head.php');
 }
 ?>
-<div id="wpbody">
-<div id="wpbody-content">
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 1161932d47..e50d25555b 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -104,34 +104,21 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
 ?>
 
 <ul id="dashmenu" class="wp-menu">
-
 <?php
 
 _wp_menu_output( $top_menu, $top_submenu, false );
 do_action( 'dashmenu' );
 
 ?>
-
-
 </ul>
 
-
 <ul id="adminmenu" class="wp-menu">
 
 <li class="write-new-button"><a class="button-secondary" href="post-new.php"><?php _e( 'Write New Post' ); ?></a></li>
-
 <?php
 
 _wp_menu_output( $menu, $submenu );
 do_action( 'adminmenu' );
 
 ?>
-
-
 </ul>
-
-<?php
-
-do_action('admin_notices');
-
-?>