Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2052)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2053)
@@ -121,4 +121,6 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2066">#2066</a>] Added a workaround for a Mac
 			Safari 3.1 browser bug which caused the Fit Window button to give a blank screen.</li> 
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2218">#2218</a>] Improved Gecko based browser
+			detection to accept Epiphany/Gecko as well.</li>
 	</ul>
 	<h3>
Index: /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js	(revision 2052)
+++ /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js	(revision 2053)
@@ -29,5 +29,4 @@
 	IsIE7		: /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 7 ),
 	IsIE6		: /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 6 ),
-	IsGecko		: s.Contains('gecko/'),
 	IsSafari	: s.Contains(' applewebkit/'),		// Read "IsWebKit"
 	IsOpera		: !!window.opera,
@@ -39,9 +38,11 @@
 (function( browserInfo )
 {
+	browserInfo.IsGecko = ( navigator.product == 'Gecko' ) && !browserInfo.IsSafari && !browserInfo.IsOpera ;
 	browserInfo.IsGeckoLike = ( browserInfo.IsGecko || browserInfo.IsSafari || browserInfo.IsOpera ) ;
 
 	if ( browserInfo.IsGecko )
 	{
-		var geckoVersion = s.match( /gecko\/(\d+)/ )[1] ;
+		var geckoMatch = s.match( /rv:(\d+\.\d+)/ ) ;
+		var geckoVersion = geckoMatch && parseFloat( geckoMatch[1] ) ;
 
 		// Actually "10" refers to Gecko versions before Firefox 1.5, when
@@ -52,10 +53,9 @@
 		// be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111).
 
-		// TODO: Future versions may consider the rv number only, but it is
-		// still to check that all Gecko based browser present the rv number.
-		browserInfo.IsGecko10 = ( ( geckoVersion < 20051111 ) || ( /rv:1\.7/.test(s) ) ) ;
-		browserInfo.IsGecko19 = /rv:1\.9/.test(s) ;
+		if ( geckoVersion )
+		{
+			browserInfo.IsGecko10 = ( geckoVersion < 1.8 ) ;
+			browserInfo.IsGecko19 = ( geckoVersion > 1.8 ) ;
+		}
 	}
-	else
-		browserInfo.IsGecko10 = false ;
 })(FCKBrowserInfo) ;