Merge branch 't/8103'

ckeditor · Aug 27, 2013 · acaffaa · acaffaa
2 parents d065eac + 779437e
commit acaffaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@ CKEditor 4 Changelog
 
 ## CKEditor 4.2.1
 
+* [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
 * [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from Styles drop-down list not registered to the ACF in case when [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used.
 * [#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.

diff --git a/plugins/pastefromword/filter/default.js b/plugins/pastefromword/filter/default.js
@@ -371,6 +371,8 @@
 						element.children = [];
 						for ( var j = 0, num = children.length; j < num; j++ )
 							element.add( children[ j ] );
+
+						children = element.children;
 					}
 				}