From 365025fb625d36abd4cbec5f60e271faeb35d1aa Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Thu, 18 Jan 2018 14:43:31 +0000
Subject: [PATCH] Editor: change the test in `user_can_richedit()` to also
 detect when IE11 is in compatibility mode.

Props ndavison, azaozz.
Fixes #42503 for trunk.
Built from https://develop.svn.wordpress.org/trunk@42529


git-svn-id: http://core.svn.wordpress.org/trunk@42358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 2 +-
 wp-includes/version.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index ca2dbc02ec..4fda9c725b 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -3081,7 +3081,7 @@ function user_can_richedit() {
 			if ( $is_safari ) {
 				$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
 			} elseif ( $is_IE ) {
-				$wp_rich_edit = ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE ' ) === false );
+				$wp_rich_edit = ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' ) !== false );
 			} elseif ( $is_gecko || $is_chrome || $is_edge || ( $is_opera && ! wp_is_mobile() ) ) {
 				$wp_rich_edit = true;
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 44be45792a..eb86d0f630 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42528';
+$wp_version = '5.0-alpha-42529';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.