From 88c0df0623212287eb775484e0799d9f1a9d07f6 Mon Sep 17 00:00:00 2001
From: Stanislas Rolland <typo3@sjbr.ca>
Date: Thu, 20 Jan 2011 07:05:02 +0000
Subject: [PATCH] Fixed bug #17157: htmlArea RTE: Not enabled in various
 browser/system combinations

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10150 709f56b5-9817-0410-a4d7-c38de5d9e867
---
 ChangeLog                                     |  1 +
 typo3/sysext/rtehtmlarea/ChangeLog            |  1 +
 .../rtehtmlarea/class.tx_rtehtmlarea_base.php | 62 ++++++++++---------
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 437f2de86ba6..2574f1635cdf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 2011-01-19  Stanislas Rolland  <typo3@sjbr.ca>
 
 	* Fixed bug #17156: htmlArea RTE: Disable Cell merge button in FF when less than two cells are selected
+	* Fixed bug #17157: htmlArea RTE: Not enabled in various browser/system combinations
 
 2011-01-19  Steffen Kamper  <steffen@typo3.org>
 
diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 36d31b0f3b7e..472a094b9b00 100644
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2011-01-19  Stanislas Rolland  <typo3@sjbr.ca>
 
 	* Fixed bug #17156: htmlArea RTE: Disable Cell merge button in FF when less than two cells are selected
+	* Fixed bug #17157: htmlArea RTE: Not enabled in various browser/system combinations 
 
 2011-01-18  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 a276718d0cd9..22ac99fb63f2 100644
--- a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
+++ b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
@@ -39,48 +39,59 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
 		// Configuration of supported browsers
 	var $conf_supported_browser = array (
 			'msie' => array (
-				1 => array (
+				array (
 					'version' => 6.0,
-					'system' => 'winNT'
-				),
-				2 => array (
-					'version' => 6.0,
-					'system' => 'win98'
 				),
-				3 => array (
-					'version' => 6.0,
-					'system' => 'win95'
-				)
 			),
 			'gecko' => array (
-				1 => array (
+				array (
 					'version' => 1.8
-				)
+				),
 			),
 			'webkit' => array (
-				1 => array (
+				array (
 					'version' => 523,
 					'system' => 'mac'
 				),
-				2 => array (
+				array (
 					'version' => 523,
-					'system' => 'winNT'
+					'system' => 'linux'
 				),
-				3 => array (
+				array (
 					'version' => 523,
-					'system' => 'linux'
+					'system' => 'win7'
+				),
+				array (
+					'version' => 523,
+					'system' => 'winVista'
 				),
-				4 => array (
+				array (
+					'version' => 523,
+					'system' => 'winXP'
+				),
+				array (
+					'version' => 523,
+					'system' => 'win2k'
+				),
+				array (
+					'version' => 523,
+					'system' => 'winNT'
+				),
+				array (
 					'version' => 523,
 					'system' => 'win98'
 				),
-				5 => array (
+				array (
 					'version' => 523,
 					'system' => 'win95'
-				)
+				),
+				array (
+					'version' => 523,
+					'system' => 'chrome'
+				),
 			),
 			'opera' => array (
-				1 => array (
+				array (
 					'version' => 9.62
 				)
 			)
@@ -1400,15 +1411,6 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
 				}
 			}
 		}
-		if ($browserInfo['system'] == 'mac') {
-			if (strstr($userAgent,'iPad')) {
-				$browserInfo['system'] = 'iPad';
-			} elseif (strstr($userAgent,'iPhone')) {
-				$browserInfo['system'] = 'iPhone';
-			} elseif (strstr($userAgent,'iPod')) {
-				$browserInfo['system'] = 'iPod';
-			}
-		}
 		return $browserInfo;
 	}
 	/***************************
-- 
2.20.1