diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/index.php --- a/wp/wp-admin/index.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-admin/index.php Tue Dec 15 13:49:49 2020 +0100 @@ -7,10 +7,10 @@ */ /** Load WordPress Bootstrap */ -require_once( dirname( __FILE__ ) . '/admin.php' ); +require_once __DIR__ . '/admin.php'; /** Load WordPress dashboard API */ -require_once( ABSPATH . 'wp-admin/includes/dashboard.php' ); +require_once ABSPATH . 'wp-admin/includes/dashboard.php'; wp_dashboard_setup(); @@ -44,7 +44,7 @@ ) ); -// Help tabs +// Help tabs. $help = '

' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '

'; $help .= '

' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '

'; @@ -83,7 +83,7 @@ } $help .= '

' . sprintf( - /* translators: %s: WordPress Planet URL */ + /* translators: %s: WordPress Planet URL. */ __( 'WordPress Events and News — Upcoming events near you as well as the latest news from the official WordPress project and the WordPress Planet.' ), __( 'https://planet.wordpress.org/' ) ) . '

'; @@ -104,23 +104,52 @@ $screen->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Dashboard' ) . '

' . + '

' . __( 'Documentation on Dashboard' ) . '

' . '

' . __( 'Support' ) . '

' ); -include( ABSPATH . 'wp-admin/admin-header.php' ); +require_once ABSPATH . 'wp-admin/admin-header.php'; ?>

+ +
+

+ +

+
+ + + user_email != get_option( 'admin_email' ) ); + $option = (int) get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); + // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner. + $hide = ( 0 === $option || ( 2 === $option && wp_get_current_user()->user_email !== get_option( 'admin_email' ) ) ); if ( $hide ) { $classes .= ' hidden'; } @@ -153,4 +182,4 @@