Skip to content

Commit f08ec06

Browse files
committed
Remove charset conversion in LLL view helper
With TYPO3 6.2 it is assumed that all strings are utf-8. A source charset is not needed anymore. Thus csConv is a no-op when not providing no source charset and can be removed as well. Change-Id: Ie35be34afdf900cb59dc239dfd94ed07bae1ca3b
1 parent d7aff67 commit f08ec06

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

Classes/ViewHelper/Lll.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,11 @@ protected function loadLL() {
9898
foreach ($configuration['_LOCAL_LANG.'] as $language => $overideLabels) {
9999
$language = substr($language, 0, -1);
100100

101-
$languageCharset = $GLOBALS['TSFE']->csConvObj->charSetArray[$language];
102-
if (!empty($GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'])) {
103-
$languageCharset = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'];
104-
}
105-
106101
if (is_array($overideLabels)) {
107102
foreach ($overideLabels as $labelKey => $overideLabel) {
108103
if (!is_array($overideLabel)) {
109104
$this->localLang[$this->languageFile][$language][$labelKey] = array(array(
110-
'source' => $GLOBALS['TSFE']->csConv($overideLabel, $languageCharset)
105+
'source' => $overideLabel
111106
));
112107
}
113108
}

0 commit comments

Comments
 (0)