diff --git a/wp-admin/about.php b/wp-admin/about.php index 21156f0f3a..6a9c646f59 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -13,7 +13,7 @@ $title = __( 'About' ); list( $display_version ) = explode( '-', $wp_version ); -include( './admin-header.php' ); +include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -38,8 +38,8 @@ include( './admin-header.php' );
- - + +

@@ -69,12 +69,12 @@ include( './admin-header.php' );
- +

- +

@@ -86,8 +86,8 @@ include( './admin-header.php' );
- - + +

@@ -109,7 +109,7 @@ include( './admin-header.php' );

- +

@@ -161,17 +161,18 @@ include( './admin-header.php' );
- "> | - +
@@ -73,7 +73,7 @@ if ( ! $credits ) { 'http://wordpress.org/about/', /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */ __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '

'; - include( './admin-footer.php' ); + include( ABSPATH . 'wp-admin/admin-footer.php' ); exit; } @@ -134,7 +134,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
@@ -54,4 +54,4 @@ printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%%

Free Software Foundation.' ); ?>

- + diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 3e9602b578..8b5a8e4fe5 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -601,7 +601,7 @@ function _copy_dir($from, $to, $skip_list = array() ) { /** * Redirect to the About WordPress page after a successful upgrade. * - * This function is only needed when the existing install is older than 3.3.0. + * This function is only needed when the existing install is older than 3.3.0 (3.4.0 for multisite). * * @since 3.3.0 * @@ -609,8 +609,13 @@ function _copy_dir($from, $to, $skip_list = array() ) { function _redirect_to_about_wordpress( $new_version ) { global $wp_version, $pagenow, $action; - if ( version_compare( $wp_version, '3.3', '>=' ) ) + if ( is_multisite() ) { + // Change to self_admin_url(). + if ( version_compare( $wp_version, '3.4-alpha', '>=' ) ) + return; + } elseif ( version_compare( $wp_version, '3.3', '>=' ) ) { return; + } // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts. if ( 'update-core.php' != $pagenow ) @@ -624,12 +629,12 @@ function _redirect_to_about_wordpress( $new_version ) { // See do_core_upgrade() show_message( __('WordPress updated successfully') ); - show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '' ); - show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. Learn more.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '' ); + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. Learn more.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); echo '
'; ?> ' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '

'; } else { list( $normalized_version ) = explode( '-', $wp_version ); - echo '

' . sprintf( __( 'Learn more about WordPress %s.' ), esc_url( admin_url( 'about.php' ) ), $normalized_version ) . '

'; + echo '

' . sprintf( __( 'Learn more about WordPress %s.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '

'; } dismissed_updates(); @@ -382,12 +382,12 @@ function do_core_upgrade( $reinstall = false ) { } show_message( __('WordPress updated successfully') ); - show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ), $result, esc_url( admin_url( 'about.php?updated' ) ) ) . '' ); - show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. Learn more.' ), $result, esc_url( admin_url( 'about.php?updated' ) ) ) . '' ); + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. Learn more.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); ?>
add_menu( array( 'id' => 'wp-logo', 'title' => '', - 'href' => admin_url( 'about.php' ), + 'href' => is_network_admin() ? network_admin_url( 'about.php' ) : admin_url( 'about.php' ), 'meta' => array( 'title' => __('About WordPress'), ), @@ -87,7 +87,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo', 'id' => 'about', 'title' => __('About WordPress'), - 'href' => admin_url('about.php'), + 'href' => is_network_admin() ? network_admin_url( 'about.php' ) : admin_url( 'about.php' ), ) ); }