Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Various docs syntax fixes in wp-includes/formatting.php. 

See #31888.

Built from https://develop.svn.wordpress.org/trunk@32039


git-svn-id: http://core.svn.wordpress.org/trunk@32018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-04-05 15:51:27 +00:00
parent 7bcbe0cce1
commit 82e4990b73
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/formatting.php
View File

@ -4134,7 +4134,7 @@ function print_emoji_detection_script() {
*
* @param string The emoji extension. Default .png.
*/
'ext' => apply_filters( 'emoji_ext', '.png' ),
'ext' => apply_filters( 'emoji_ext', '.png' ),
);
$version = 'ver=' . $wp_version;
@ -4344,10 +4344,10 @@ function _wp_staticize_emoji_for_email( $mail ) {
continue;
}
// Explode them out
// Explode them out.
list( $name, $content ) = explode( ':', trim( $header ), 2 );
// Cleanup crew
// Cleanup crew.
$name = trim( $name );
$content = trim( $content );
@ -4362,7 +4362,7 @@ function _wp_staticize_emoji_for_email( $mail ) {
}
}
// Set Content-Type if we don't have a content-type from the input headers
// Set Content-Type if we don't have a content-type from the input headers.
if ( ! isset( $content_type ) ) {
$content_type = 'text/plain';
}

2
wp-includes/version.php
View File

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