From 8d9fc7e51bb7911f5924025319823e21d9c3be98 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Wed, 18 Mar 2015 21:54:26 +0000
Subject: [PATCH] TinyMCE emoji: fix highlighting of selected replacement
 images in Chrome. Props iseulde. Fixes #31628. Built from
 https://develop.svn.wordpress.org/trunk@31822

git-svn-id: http://core.svn.wordpress.org/trunk@31804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/tinymce/skins/wordpress/wp-content.css | 4 ++--
 wp-includes/version.php                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index 78d44c950c..dd7b5c48db 100644
--- a/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -140,7 +140,7 @@ dl.wp-caption * {
 }
 
 /* Remove blue highlighting of selected images in WebKit */
-img::selection {
+img[data-mce-selected]::selection {
 	background-color: transparent;
 }
 
@@ -162,7 +162,7 @@ img::selection {
 	cursor: default;
 }
 
-.mce-content-body img[data-wp-more][data-mce-selected] {
+.mce-content-body img[data-mce-placeholder][data-mce-selected] {
 	outline: 1px dotted #888;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 82758cbc4d..d75f986c53 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta1-31821';
+$wp_version = '4.2-beta1-31822';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.