Merge branch 't/10265'

ckeditor · Apr 2, 2013 · 8ad32fe · 8ad32fe
2 parents 86d354e + c16e257
commit 8ad32fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,7 @@ CKEditor 4 Changelog
 
 * [#10172](http://dev.ckeditor.com/ticket/10172): Pressing delete/backspace in empty table cell moves cursor to next/previous cell.
 * [#10219](http://dev.ckeditor.com/ticket/10219): Error thrown when destroying an instance in parallel with a mouseup event.
+* [#10265](http://dev.ckeditor.com/ticket/10265): Wrong loop type in filebrowser plugin.
 
 ## CKEditor 4.1
 

diff --git a/plugins/filebrowser/plugin.js b/plugins/filebrowser/plugin.js
@@ -219,9 +219,12 @@
 	//            elements Array of {@link CKEDITOR.dialog.definition.content}
 	//            objects.
 	function attachFileBrowser( editor, dialogName, definition, elements ) {
+		if ( !elements || !elements.length )
+			return;
+
 		var element, fileInput;
 
-		for ( var i in elements ) {
+		for ( var i = elements.length; i--; ) {
 			element = elements[ i ];
 
 			if ( element.type == 'hbox' || element.type == 'vbox' || element.type == 'fieldset' )