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
This commit is contained in:
parent
803b1572e6
commit
3c1095b79c
|
@ -133,10 +133,13 @@ if ( ! $is_opera ) {
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
require(ABSPATH . 'wp-admin/menu-header.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' ) {
|
if ( $parent_file == 'options-general.php' ) {
|
||||||
require(ABSPATH . 'wp-admin/options-head.php');
|
require(ABSPATH . 'wp-admin/options-head.php');
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<div id="wpbody">
|
|
||||||
<div id="wpbody-content">
|
|
||||||
|
|
|
@ -104,34 +104,21 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<ul id="dashmenu" class="wp-menu">
|
<ul id="dashmenu" class="wp-menu">
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
_wp_menu_output( $top_menu, $top_submenu, false );
|
_wp_menu_output( $top_menu, $top_submenu, false );
|
||||||
do_action( 'dashmenu' );
|
do_action( 'dashmenu' );
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
<ul id="adminmenu" class="wp-menu">
|
<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>
|
<li class="write-new-button"><a class="button-secondary" href="post-new.php"><?php _e( 'Write New Post' ); ?></a></li>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
_wp_menu_output( $menu, $submenu );
|
_wp_menu_output( $menu, $submenu );
|
||||||
do_action( 'adminmenu' );
|
do_action( 'adminmenu' );
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
do_action('admin_notices');
|
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
Loading…
Reference in New Issue