Changeset 21706

Timestamp:

09/03/2012 10:07:34 PM (13 years ago)

Author:

nacin

Message:

Fix a placeholder in a string without breaking said string in a branch. fixes #21511.

File:

• branches/3.4/wp-admin/includes/update-core.php (modified) (2 diffs)

branches/3.4/wp-admin/includes/update-core.php

@@ -681 +681 @@
     global $wp_version, $pagenow, $action;
 
-    if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
+    if ( version_compare( $wp_version, '3.5-alpha', '>=' ) )
         return;
 
@@ -697 +697 @@
     show_message( __('WordPress updated successfully') );
 
+    $js_message = __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' );
+    $js_message = str_replace( '"%s"', '"%2$s"', $js_message ); // in lieu of breaking the string.
+
     // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.
-    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, 'about.php?updated' ) . '</span>' );
+    show_message( '<span class="hide-if-no-js">' . sprintf( $js_message, $new_version, '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, 'about.php?updated' ) . '</span>' );
     echo '</div>';