Merge branch 't/9654'

ckeditor · Aug 27, 2013 · 0fb7afe · 0fb7afe
2 parents 402f68f + f587e5c
commit 0fb7afe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@ CKEditor 4 Changelog
 
 ## CKEditor 4.2.1
 
+* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with IE10 Quirks mode.
 * [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.
 * [#10646](http://dev.ckeditor.com/ticket/10646): Removing selected sub-list or nested table with *Backspace/Delete* removes parent element.
 

diff --git a/core/env.js b/core/env.js
@@ -181,11 +181,11 @@ if ( !CKEDITOR.env ) {
 			env.ie9Compat = version == 9;
 			env.ie8Compat = version == 8;
 			env.ie7Compat = version == 7;
-			env.ie6Compat = version < 7 || env.quirks;
+			env.ie6Compat = version < 7 || ( env.quirks && version < 10 );
 
 			/**
 			 * Indicates that CKEditor is running in an IE6-like environment, which
-			 * includes IE6 itself as well as IE7 and IE8 in Quirks Mode.
+			 * includes IE6 itself as well as IE7, IE8 and IE9 in Quirks Mode.
 			 *
 			 * @deprecated
 			 * @property {Boolean} ie6Compat