Index: /FCKeditor/trunk/editor/_source/classes/fckeditingarea.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckeditingarea.js	(revision 932)
+++ /FCKeditor/trunk/editor/_source/classes/fckeditingarea.js	(revision 933)
@@ -97,5 +97,5 @@
 				// If nothing in the body, place a BOGUS tag so the cursor will appear.
 				if ( FCKBrowserInfo.IsGecko && ( sBody.length == 0 || FCKRegexLib.EmptyParagraph.test( sBody ) ) )
-					sBody = GECKO_BOGUS ;
+					sBody = '<br type="_moz">' ;
 
 				this._BodyHTML = sBody ;
Index: /FCKeditor/trunk/editor/_source/classes/fckenterkey.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckenterkey.js	(revision 932)
+++ /FCKeditor/trunk/editor/_source/classes/fckenterkey.js	(revision 933)
@@ -444,9 +444,6 @@
 				eNewBlock = this.Window.document.createElement( blockTag ) ;
 
-			// Opera needs some text (even empty) to correctly position the caret (#214).
-			if ( FCKBrowserInfo.IsOpera )
-				eNewBlock.appendChild( this.Window.document.createTextNode( '' ) ) ;
-			else if ( FCKBrowserInfo.IsGeckoLike )
-				eNewBlock.innerHTML = GECKO_BOGUS ;
+			if ( FCKBrowserInfo.IsGeckoLike )
+				FCKTools.AppendBogusBr( eNewBlock ) ;
 
 			oRange.InsertNode( eNewBlock ) ;
Index: /FCKeditor/trunk/editor/_source/internals/fck.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck.js	(revision 932)
+++ /FCKeditor/trunk/editor/_source/internals/fck.js	(revision 933)
@@ -604,6 +604,6 @@
 				next = this.EditorDocument.body.appendChild( this.EditorDocument.createElement( FCKConfig.EnterMode ) ) ;
 
-				if ( FCKBrowserInfo.IsGecko )
-					next.innerHTML = GECKO_BOGUS ;
+				if ( FCKBrowserInfo.IsGeckoLike )
+					FCKTools.AppendBogusBr( next ) ;
 			}
 
Index: /FCKeditor/trunk/editor/_source/internals/fcktablehandler.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fcktablehandler.js	(revision 932)
+++ /FCKeditor/trunk/editor/_source/internals/fcktablehandler.js	(revision 933)
@@ -132,5 +132,5 @@
 
 		if ( FCKBrowserInfo.IsGeckoLike )
-			oCell.innerHTML = GECKO_BOGUS ;
+			FCKTools.AppendBogusBr( oCell ) ;
 
 		// Get back the currently selected cell.
@@ -203,5 +203,5 @@
 	var oNewCell = FCK.EditorDocument.createElement( 'TD' ) ;
 	if ( FCKBrowserInfo.IsGeckoLike )
-		oNewCell.innerHTML = GECKO_BOGUS ;
+		FCKTools.AppendBogusBr( oNewCell ) ;
 
 	if ( !insertBefore && oCell.cellIndex == oCell.parentNode.cells.length - 1 )
@@ -792,8 +792,8 @@
 	for ( var i = 0 ; i < aCells.length ; i++ )
 	{
+		aCells[i].innerHTML = '' ;
+
 		if ( FCKBrowserInfo.IsGeckoLike )
-			aCells[i].innerHTML = GECKO_BOGUS ;
-		else
-			aCells[i].innerHTML = '' ;
+			FCKTools.AppendBogusBr( aCells[i] ) ;
 	}
 }
Index: /FCKeditor/trunk/editor/_source/internals/fcktools.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fcktools.js	(revision 932)
+++ /FCKeditor/trunk/editor/_source/internals/fcktools.js	(revision 933)
@@ -21,8 +21,4 @@
  * Utility functions.
  */
-
-// Constant for the Gecko Bogus Node.
-//var GECKO_BOGUS = '<br _moz_editor_bogus_node="TRUE">' ;
-var GECKO_BOGUS = '<br type="_moz">' ;
 
 var FCKTools = new Object() ;
@@ -406,5 +402,12 @@
 
 	if ( !eLastChild || ( eLastChild.getAttribute( 'type', 2 ) != '_moz' && eLastChild.getAttribute( '_moz_dirty' ) == null ) )
-		element.appendChild( this.CreateBogusBR( this.GetElementDocument( element ) ) ) ;
+	{
+		var doc = this.GetElementDocument( element ) ;
+
+		if ( FCKBrowserInfo.IsOpera )
+			element.appendChild( doc.createTextNode('') ) ;
+		else
+			element.appendChild( this.CreateBogusBR( doc ) ) ;
+	}
 }
 
@@ -570,10 +573,10 @@
 
 /**
- * Utility function to wrap a call to an object's method, 
- * so it can be passed for example to an event handler, 
+ * Utility function to wrap a call to an object's method,
+ * so it can be passed for example to an event handler,
  * and then it will be executed with 'this' being the object.
  */
 FCKTools.Hitch = function( obj, methodName )
 {
-  return function() { obj[methodName].apply(obj, arguments); } ; 
-}
+  return function() { obj[methodName].apply(obj, arguments); } ;
+}
Index: /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js
===================================================================
--- /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js	(revision 932)
+++ /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js	(revision 933)
@@ -21,6 +21,4 @@
  * Useful functions used by almost all dialog window pages.
  */
-
-var GECKO_BOGUS = '<br type="_moz">' ;
 
 // Gets a element by its Id. Used for shorter coding.
Index: /FCKeditor/trunk/editor/dialog/fck_form.html
===================================================================
--- /FCKeditor/trunk/editor/dialog/fck_form.html	(revision 932)
+++ /FCKeditor/trunk/editor/dialog/fck_form.html	(revision 933)
@@ -61,5 +61,5 @@
 
 		if ( oEditor.FCKBrowserInfo.IsGeckoLike )
-			oActiveEl.innerHTML = GECKO_BOGUS ;
+			oEditor.FCKTools.AppendBogusBr( oActiveEl ) ;
 	}
 
Index: /FCKeditor/trunk/editor/dialog/fck_table.html
===================================================================
--- /FCKeditor/trunk/editor/dialog/fck_table.html	(revision 932)
+++ /FCKeditor/trunk/editor/dialog/fck_table.html	(revision 933)
@@ -153,6 +153,5 @@
 				var oCell = oRow.insertCell(-1) ;
 				if ( oEditor.FCKBrowserInfo.IsGeckoLike )
-					oCell.innerHTML = GECKO_BOGUS ;
-				//oCell.innerHTML = "&nbsp;" ;
+					oEditor.FCKTools.AppendBogusBr( oCell ) ;
 			}
 		}