Feature #20955 » 11825_v1.diff
| t3lib/class.t3lib_div.php (working copy) | ||
|---|---|---|
|
} else {
|
||
|
die('File "' . $fileRef. '" not found!');
|
||
|
}
|
||
|
if (isset($GLOBALS['TYPO3_CONF_VARS']['XLL'][$fileRef])) {
|
||
|
$languageOverrideFileName = t3lib_div::getFileAbsFileName($GLOBALS['TYPO3_CONF_VARS']['XLL'][$fileRef]);
|
||
|
if (@is_file($languageOverrideFileName)) {
|
||
|
$languageOverrideArray = t3lib_div::readLLXMLfile($languageOverrideFileName, $langKey, $charset);
|
||
|
$LOCAL_LANG = t3lib_div::array_merge_recursive_overrule($LOCAL_LANG, $languageOverrideArray);
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
return is_array($LOCAL_LANG) ? $LOCAL_LANG : array();
|
||
| typo3/sysext/cms/tslib/class.tslib_pibase.php (working copy) | ||
|---|---|---|
|
*/
|
||
|
function pi_loadLL() {
|
||
|
if (!$this->LOCAL_LANG_loaded && $this->scriptRelPath) {
|
||
|
$basePath = t3lib_extMgm::extPath($this->extKey).dirname($this->scriptRelPath).'/locallang.php';
|
||
|
$basePath = 'EXT:' . $this->extKey . '/' . dirname($this->scriptRelPath) . '/locallang.xml';
|
||
|
// Read the strings in the required charset (since TYPO3 4.2)
|
||
|
$this->LOCAL_LANG = t3lib_div::readLLfile($basePath,$this->LLkey,$GLOBALS['TSFE']->renderCharset);
|
||