Changeset 19699 for trunk/wp-admin/includes/update-core.php

Timestamp:

01/06/2012 05:53:41 PM (15 years ago)

Author:

nacin

Message:

Create a network/about.php page and leverage it, to prevent the dashboard from switching to the blog admin. fixes #19762.

File:

• trunk/wp-admin/includes/update-core.php (modified) (3 diffs)

trunk/wp-admin/includes/update-core.php

@@ -602 +602 @@
  * 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
@@ -610 +610 @@
         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.
@@ -625 +630 @@
         // See do_core_upgrade()
         show_message( __('WordPress updated successfully') );
-        show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
-        show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
+        show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
+        show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
         echo '</div>';
         ?>
 <script type="text/javascript">
-window.location = '<?php echo admin_url( 'about.php?updated' ); ?>';
+window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>';
 </script>
         <?php