From d0d5afbf757225bf8e1936fffa0903f77c64b96b Mon Sep 17 00:00:00 2001
From: sgalinsk <sgalinsk@735d13b6-9817-0410-8766-e36946ffe9aa>
Date: Fri, 15 Jun 2012 18:18:53 +0000
Subject: [PATCH] [BUGFIX] isoArray is deprecated
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/tinymce/trunk@63492 735d13b6-9817-0410-8766-e36946ffe9aa
---
class.tinymce.php | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/class.tinymce.php b/class.tinymce.php
index e3c784b..ba77593 100644
--- a/class.tinymce.php
+++ b/class.tinymce.php
@@ -87,7 +87,8 @@ class tinyMCE {
* @return void
*/
protected function setLanguage() {
- $languageInstance = (TYPO3_MODE == 'FE' ? $GLOBALS['TSFE'] : $GLOBALS['LANG']);
+ /** @var $languageInstance language */
+ $languageInstance = (TYPO3_MODE === 'FE' ? $GLOBALS['TSFE'] : $GLOBALS['LANG']);
$languageKey = $languageInstance->lang;
$groupOrUserProps = t3lib_BEfunc::getModTSconfig('', 'tx_tinyMCE');
@@ -96,8 +97,16 @@ class tinyMCE {
}
// language conversion from TLD to iso631
- if (array_key_exists($languageKey, $languageInstance->csConvObj->isoArray)) {
- $languageKey = $languageInstance->csConvObj->isoArray[$languageKey];
+ if (class_exists('t3lib_l10n_Locales')) {
+ /** @var $locales t3lib_l10n_Locales */
+ $locales = t3lib_div::makeInstance('t3lib_l10n_Locales');
+ $isoArray = $locales->getIsoMapping();
+ } else {
+ $isoArray = $languageInstance->csConvObj->isoArray;
+ }
+
+ if (array_key_exists($languageKey, $isoArray)) {
+ $languageKey = $isoArray[$languageKey];
}
$languageFile = PATH_site . t3lib_extMgm::siteRelPath('tinymce') . 'tinymce/langs/' . $languageKey . '.js';
--
GitLab