Merge branch 't/10877' into major

ckeditor · Oct 18, 2013 · e49980f · e49980f
2 parents 1066410 + 634f599
commit e49980f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -16,6 +16,7 @@ Fixed Issues:
 * [#10836](http://dev.ckeditor.com/ticket/10836): [Enhanced Image](http://ckeditor.com/addon/image2): Preserve custom mouse cursor while resizing the image.
 * [#10881](http://dev.ckeditor.com/ticket/10881): Various improvements to *Enter* key behaviour in nested editables.
 * [#10879](http://dev.ckeditor.com/ticket/10879): Remove format should not leak from nested editable.
+* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: WebSpellChecker fails to apply changes if nested editable was focused.
 
 ## CKEditor 4.3 Beta
 

diff --git a/core/editor.js b/core/editor.js
@@ -218,6 +218,12 @@
 	}
 
 	function updateCommandsContext( editor, path, forceRefresh ) {
+		// Commands cannot be refreshed without a path. In edge cases
+		// it may happen that there's no selection when this function is executed.
+		// For example when active filter is changed in #10877.
+		if ( !path )
+			return;
+
 		var command,
 			name,
 			commands = editor.commands;