Index: /CKEditor/branches/features/bbcode/_source/plugins/bbcode/plugin.js
===================================================================
--- /CKEditor/branches/features/bbcode/_source/plugins/bbcode/plugin.js	(revision 6705)
+++ /CKEditor/branches/features/bbcode/_source/plugins/bbcode/plugin.js	(revision 6706)
@@ -658,4 +658,16 @@
 	  {
 		  requires : [ 'htmldataprocessor' ],
+		  beforeInit : function( editor )
+		  {
+			  // Adapt some critical editor configuration for better support
+			  // of BBCode environment.
+			  var config = editor.config;
+			  CKEDITOR.tools.extend( config,
+			  {
+				  enterMode : CKEDITOR.ENTER_BR,
+				  entities : false,
+				  fillEmptyBlocks : false
+			  }, true );
+		  },
 		  init : function( editor )
 		  {
Index: /CKEditor/branches/features/bbcode/_source/plugins/bidi/plugin.js
===================================================================
--- /CKEditor/branches/features/bbcode/_source/plugins/bidi/plugin.js	(revision 6705)
+++ /CKEditor/branches/features/bbcode/_source/plugins/bidi/plugin.js	(revision 6706)
@@ -226,17 +226,4 @@
 	{
 		requires : [ 'styles', 'button' ],
-
-		beforeInit : function( editor )
-		{
-			// Adapt some critical editor configuration for better support
-			// of BBCode environment.
-			var config = editor.config;
-			CKEDITOR.tools.extend( config,
-			{
-				enterMode : CKEDITOR.ENTER_BR,
-				entities : false,
-				fillEmptyBlocks : false
-			}, true );
-		},
 
 		init : function( editor )