Clean up wp-admin/index.php after dash merge. see #25824.

git-svn-id: https://develop.svn.wordpress.org/trunk@26183 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-11-14 23:58:55 +00:00
parent 17a8516d2e
commit 513f36d6f7

View File

@ -89,16 +89,14 @@ $screen->set_help_sidebar(
'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
); );
include ( ABSPATH . 'wp-admin/admin-header.php' ); include( ABSPATH . 'wp-admin/admin-header.php' );
$today = current_time( 'mysql', 1 );
?> ?>
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?></h2> <h2><?php echo esc_html( $title ); ?></h2>
<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) : <?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
$classes = 'welcome-panel'; $classes = 'welcome-panel';
$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
@ -122,7 +120,7 @@ $today = current_time( 'mysql', 1 );
do_action( 'welcome_panel' ); do_action( 'welcome_panel' );
?> ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div id="dashboard-widgets-wrap"> <div id="dashboard-widgets-wrap">
<?php wp_dashboard(); ?> <?php wp_dashboard(); ?>
@ -130,4 +128,5 @@ $today = current_time( 'mysql', 1 );
</div><!-- wrap --> </div><!-- wrap -->
<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?> <?php
require( ABSPATH . 'wp-admin/admin-footer.php' );