PressThis:

- Replace all `%1$s` and `%2$s` in suggestedHTML in case plugins repeat them.
- Fix docs typo, props kraftbj.
See #31373.
Built from https://develop.svn.wordpress.org/trunk@31596


git-svn-id: http://core.svn.wordpress.org/trunk@31577 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/class-wp-press-this.php

@@ -60,7 +60,7 @@ class WP_Press_This {
 	}
 
 	/**
-	 * Get the sources images and save them locally, fr posterity, unless we can't.
+	 * Get the source's images and save them locally, for posterity, unless we can't.
 	 *
 	 * @since 4.2.0
 	 * @access public

wp-admin/js/press-this.js

@@ -208,7 +208,7 @@
 
 			// Add a source attribution if there is one available.
 			if ( url && siteConfig.suggestedHTML && ( ( title && __( 'newPost' ) !== title ) || siteName ) ) {
-				content += siteConfig.suggestedHTML.replace( '%1$s', encodeURI( url ) ).replace( '%2$s', ( title || siteName ) );
+				content += siteConfig.suggestedHTML.replace( /%1\$s/g, encodeURI( url ) ).replace( /%2\$s/g, ( title || siteName ) );
 			}
 
 			return content || '';

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31595';
+$wp_version = '4.2-alpha-31596';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.