Fixed bug #12486: RTE does not work with Arora

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7829 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 72b2255..20c844d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 2010-06-06  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up to bug #14360: htmlArea RTE: Toolbar and context menu styling needs adjustments
+       * Fixed bug #12486: RTE does not work with Arora
 
 2010-06-06  Ingo Renner  <ingo@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index b3fd6f8..d1d3a8f 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2010-06-06  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up to bug #14360: htmlArea RTE: Toolbar and context menu styling needs adjustments
+       * Fixed bug #12486: RTE does not work with arora
 
 2010-06-05  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
index 941dbf4..e0ef6a7 100644 (file)
--- a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
+++ b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
@@ -1396,7 +1396,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        $bInfo['BROWSER']= 'msie';
                } elseif (strstr($useragent,'Gecko/'))  {
                        $bInfo['BROWSER']='gecko';
-               } elseif (strstr($useragent,'Safari/')) {
+               } elseif (strstr($useragent,'WebKit/')) {
                        $bInfo['BROWSER']='safari';
                } elseif (strstr($useragent,'Mozilla/4')) {
                        $bInfo['BROWSER']='net';
@@ -1419,7 +1419,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                                        $bInfo['VERSION'] = doubleval(preg_replace('/^[^0-9]*/','',substr($tmp,4)));
                                break;
                                case 'safari':
-                                       $tmp = strstr($useragent,'Safari/');
+                                       $tmp = strstr($useragent,'WebKit/');
                                        $bInfo['VERSION'] = doubleval(preg_replace('/^[^0-9]*/','',substr($tmp,3)));
                                break;
                                case 'opera':