Index: /FCKeditor/trunk/_test/automated/tests/fckdataprocessor.html
===================================================================
--- /FCKeditor/trunk/_test/automated/tests/fckdataprocessor.html	(revision 2358)
+++ /FCKeditor/trunk/_test/automated/tests/fckdataprocessor.html	(revision 2359)
@@ -165,4 +165,13 @@
 }
 
+function test_ConvertToDataFormat_Character_Transform()
+{
+	var dataProcessor = new FCKDataProcessor() ;
+
+	assertEquals(
+		'<p>&lt;&lt;GetText(Edit)&gt;&gt;</p>',
+		dataProcessor.ConvertToDataFormat( document.getElementById('xDiv3'), true, true ) ) ;
+}
+
 	</script>
 </head>
@@ -170,4 +179,5 @@
 	<div id="xDiv1"><p>This is a <strong>test</strong>.</p><p>Another paragraph.</p></div>
 	<div id="xDiv2"><p>&nbsp;</p></div>
+	<div id="xDiv3"><p>&lt;&lt;GetText(Edit)&gt;&gt;</p></div>
 </body>
 </html>
Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2358)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2359)
@@ -38,5 +38,6 @@
 		New Features and Improvements:</p>
 	<ul>
-		<li></li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The &amp;gt;
+			character inside text wasn't encoded in Opera and Safari.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/internals/fckxhtmlentities.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckxhtmlentities.js	(revision 2358)
+++ /FCKeditor/trunk/editor/_source/internals/fckxhtmlentities.js	(revision 2359)
@@ -151,5 +151,5 @@
 		//	'&':'amp',		// This entity is automatically handled by the XHTML parser.
 		//	'<':'lt',		// This entity is automatically handled by the XHTML parser.
-		//	'>':'gt',		// This entity is automatically handled by the XHTML parser.
+			'>':'gt',			// Opera and Safari don't encode it in their implementation
 			'ˆ':'circ',
 			'˜':'tilde',
@@ -332,10 +332,13 @@
 	else
 	{
-		FCKXHtmlEntities.Entities = {} ;
+		FCKXHtmlEntities.Entities = {
+			'>':'gt' // Opera and Safari don't encode it in their implementation
+		} ;
+		sChars = '>';
 
 		// Even if we are not processing the entities, we must render the &nbsp;
 		// correctly. As we don't want HTML entities, let's use its numeric
 		// representation (&#160).
-		sChars = ' ' ;
+		sChars += ' ' ;
 	}