Index: C:/Program Files/EditPlus 2/sources/typo3_src-4.1/typo3/sysext/cms/tslib/class.tslib_pibase.php =================================================================== --- C:/Program Files/EditPlus 2/sources/typo3_src-4.1/typo3/sysext/cms/tslib/class.tslib_pibase.php (revision 2438) +++ C:/Program Files/EditPlus 2/sources/typo3_src-4.1/typo3/sysext/cms/tslib/class.tslib_pibase.php (working copy) @@ -941,9 +941,9 @@ */ function pi_getLL($key,$alt='',$hsc=FALSE) { if (isset($this->LOCAL_LANG[$this->LLkey][$key])) { - $word = $GLOBALS['TSFE']->csConv($this->LOCAL_LANG[$this->LLkey][$key], $this->LOCAL_LANG_charset[$this->LLkey][$key]); // The "from" charset is normally empty and thus it will convert from the charset of the system language, but if it is set (see ->pi_loadLL()) it will be used. + $word = $this->LOCAL_LANG[$this->LLkey][$key]; } elseif ($this->altLLkey && isset($this->LOCAL_LANG[$this->altLLkey][$key])) { - $word = $GLOBALS['TSFE']->csConv($this->LOCAL_LANG[$this->altLLkey][$key], $this->LOCAL_LANG_charset[$this->altLLkey][$key]); // The "from" charset is normally empty and thus it will convert from the charset of the system language, but if it is set (see ->pi_loadLL()) it will be used. + $word = $this->LOCAL_LANG[$this->altLLkey][$key]; } elseif (isset($this->LOCAL_LANG['default'][$key])) { $word = $this->LOCAL_LANG['default'][$key]; // No charset conversion because default is english and thereby ASCII } else { @@ -983,9 +983,6 @@ foreach($lA as $llK => $llV) { if (!is_array($llV)) { $this->LOCAL_LANG[$k][$llK] = $llV; - if ($k != 'default') { - $this->LOCAL_LANG_charset[$k][$llK] = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset']; // For labels coming from the TypoScript (database) the charset is assumed to be "forceCharset" and if that is not set, assumed to be that of the individual system languages (thus no conversion) - } } } }