Changeset 19532

Timestamp:

12/01/2011 06:02:18 AM (14 years ago)

Author:

nacin

Message:

Remove debug cruft and fix variable collision. fixes #18467.

Location:

trunk/wp-admin

Files:

• includes/update-core.php (modified) (2 diffs)
• update-core.php (modified) (1 diff)

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

@@ -536 +536 @@
  *
  */
-function _redirect_to_about_wordpress( $wp_version ) {
+function _redirect_to_about_wordpress( $new_version ) {
     global $wp_version, $pagenow, $action;
 
@@ -554 +554 @@
     // 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>.' ), $wp_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>.' ), $wp_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( 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>' );
     echo '</div>';
     ?>

trunk/wp-admin/update-core.php

@@ -390 +390 @@
     </div>
     <script type="text/javascript">
-    //window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';
+    window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';
     </script>
     <?php