Skip to content
Snippets Groups Projects
Commit d0d5afbf authored by sgalinsk's avatar sgalinsk
Browse files

[BUGFIX] isoArray is deprecated

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/tinymce/trunk@63492 735d13b6-9817-0410-8766-e36946ffe9aa
parent aa506a5b
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,8 @@ class tinyMCE { ...@@ -87,7 +87,8 @@ class tinyMCE {
* @return void * @return void
*/ */
protected function setLanguage() { 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; $languageKey = $languageInstance->lang;
$groupOrUserProps = t3lib_BEfunc::getModTSconfig('', 'tx_tinyMCE'); $groupOrUserProps = t3lib_BEfunc::getModTSconfig('', 'tx_tinyMCE');
...@@ -96,8 +97,16 @@ class tinyMCE { ...@@ -96,8 +97,16 @@ class tinyMCE {
} }
// language conversion from TLD to iso631 // language conversion from TLD to iso631
if (array_key_exists($languageKey, $languageInstance->csConvObj->isoArray)) { if (class_exists('t3lib_l10n_Locales')) {
$languageKey = $languageInstance->csConvObj->isoArray[$languageKey]; /** @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'; $languageFile = PATH_site . t3lib_extMgm::siteRelPath('tinymce') . 'tinymce/langs/' . $languageKey . '.js';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment