Project

General

Profile

Bug #41906 ยป 41906.diff

Franz Holzinger, 2013-09-20 11:10

View differences:

typo3_src-4.5.30.new/t3lib/class.t3lib_div.php 2013-09-20 10:50:55.000000000 +0200
);
}
$LOCAL_LANG[$langKey] = is_array($local_xmlContent['data'][$langKey]) ? $local_xmlContent['data'][$langKey] : array();
if (is_array($xmlContent['data'][$langKey])) {
$LOCAL_LANG[$langKey] = self::array_merge_recursive_overrule($LOCAL_LANG[$langKey], $xmlContent['data'][$langKey], 0, FALSE);
}
// Checking if charset should be converted.
if (is_array($LOCAL_LANG[$langKey]) && $targetCharset != 'utf-8') {
    (1-1/1)