Merge branch 't/11165'

ckeditor · Dec 4, 2013 · cb47405 · cb47405
2 parents 73ec76c + 33c99a6
commit cb47405
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/plugins/filebrowser/plugin.js b/plugins/filebrowser/plugin.js
@@ -356,6 +356,10 @@
 	});
 
 	CKEDITOR.on( 'dialogDefinition', function( evt ) {
+		// We require filebrowser plugin to be loaded.
+		if ( !evt.editor.plugins.filebrowser )
+			return;
+
 		var definition = evt.data.definition,
 			element;
 		// Associate filebrowser to elements with 'filebrowser' attribute.