Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	24 Nov 2008 14:03:51 -0000	1.45
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	7 May 2009 18:49:56 -0000	1.46
@@ -408,16 +408,17 @@
 
         set user_agent [string tolower [ns_set get [ns_conn headers] User-Agent]]
 
-        if {[string first "safari" $user_agent] != -1} {
-            if {[regexp {version/([0-9]+)[.]} $user_agent _ user_agent_version]} {
-                if {$user_agent_version < 3} {
+	if {[string first "chrome" $user_agent] != -1} {
+            # vguerra: google chrome browser
+            # needs more testing in order to check if chrome fully
+            # supports xinha
+            # roc: this check has to go first since safari use applewebkit, so the agent always contain safari word
+            # once xinha officially support chrome (already supports safari), we can remove this if and add the check at the next if.
+	} elseif {[string first "safari" $user_agent] != -1} {
+            regexp {version/([0-9]+)[.]} $user_agent _ user_agent_version
+	    if {$user_agent_version < 3} {
                     set element(htmlarea_p) false
-                } 
-            } elseif {[string first "chrome" $user_agent] != -1} {
-                # vguerra: google chrome browser
-                # needs more testing in order to check if chrome fully
-                # supports xinha.
-            }
+	    }
         } elseif {[string first "opera" $user_agent] != -1} {
             regexp {^[^/]+/([0-9]+)[.]} $user_agent _ user_agent_version
             if {$user_agent_version < 9} {