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

Emoji and smiley images should be displayed inline. 

see #31242.
Built from https://develop.svn.wordpress.org/trunk@31771


git-svn-id: http://core.svn.wordpress.org/trunk@31751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-03-13 18:45:27 +00:00
parent a1fb0a378c
commit ac90f66250
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/formatting.php
View File

@ -4041,6 +4041,7 @@ function print_emoji_styles() {
<style type="text/css"> <style type="text/css">
img.wp-smiley, img.wp-smiley,
img.emoji { img.emoji {
display: inline !important;
border: none !important; border: none !important;
box-shadow: none !important; box-shadow: none !important;
height: 1em !important; height: 1em !important;

2
wp-includes/version.php
View File

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