Index: NEWS.txt =================================================================== --- NEWS.txt (revision 6388) +++ NEWS.txt (working copy) @@ -121,8 +121,9 @@ user-defined language is available yet is detected by the preferred browser language. If you have previously changed the login labels via $TYPO3_CONF_VARS['BE']['loginLabels'] then these will be used, however it is recommended to overload the XML file with your own XML file - and $TYPO3_CONF_VARS['BE']['XLLfile']['EXT:lang/locallang_login.xml']. These will only be used - once you remove the altered "loginLabels" configuration option from typo3conf/localconf.php. + and $TYPO3_CONF_VARS['SYS']['locallangXMLOverride']['EXT:lang/locallang_login.xml']. These will + only be used once you remove the altered "loginLabels" configuration option from + typo3conf/localconf.php. * The extension "gabriel" has been integrated into the TYPO3 core as system extension "scheduler". It provides a centralized way of defining scheduled, recurring tasks, with a convenient Index: t3lib/config_default.php =================================================================== --- t3lib/config_default.php (revision 6388) +++ t3lib/config_default.php (working copy) @@ -244,7 +244,7 @@ 'loginLabels' => 'Username|Password|Interface|Log In|Log Out|Backend,Front End,Traditional Backend|Administration Login on ###SITENAME###|(Note: Cookies and JavaScript must be enabled!)|Important Messages:|Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.', // Language labels of the login prompt, separated with a pipe symbol (|). These should not be used anymore to change the labels since TYPO3 4.3, furthermore overload the labels with , see EXT:lang/locallang_login.xml for the used labels. 'loginNews' => array(), // In this array you can define news-items for the login screen. To this array, add arrays with assoc keys 'date', 'header', 'content' (HTML content) and for those appropriate value pairs 'loginNewsTitle' => '', // Define alternative header message for the LoginNews. If this var is empty, the default header "Important messages:" is displayed. - 'XLLfile' => array(), // For extension/overriding of the arrays in 'locallang' files in the backend. See 'Inside TYPO3' for more information. + 'XLLfile' => array(), // @deprecated For extension/overriding of the arrays in 'locallang' files in the backend. See 'Inside TYPO3' for more information. 'notificationPrefix' => '[TYPO3 Note]', // String: Used to prefix the subject of mails sent in the taskcenter 'accessListRenderMode' => 'singlebox', // Can be "singlebox", "checkbox" or blank. Refers to the "renderMode" for the selector boxes in be-groups configuration. 'explicitADmode' => 'explicitDeny', // Sets the general allow/deny mode for selector box values. Value can be either "explicitAllow" or "explicitDeny", nothing else! Index: typo3/sysext/lang/lang.php =================================================================== --- typo3/sysext/lang/lang.php (revision 6388) +++ typo3/sysext/lang/lang.php (working copy) @@ -320,7 +320,10 @@ } // Overriding file? + // @deprecated since TYPO3 4.3, remove in TYPO3 4.5, please use the generic method in + // t3lib_div::readLLfile and the global array $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride'] if (isset($GLOBALS['TYPO3_CONF_VARS']['BE']['XLLfile'][$parts[0]])) { + t3lib_div::deprecationLog('Usage of $TYPO3_CONF_VARS[\'BE\'][\'XLLfile\'] is deprecated since TYPO3 4.3. Use $TYPO3_CONF_VARS[\'SYS\'][\'locallangXMLOverride\'][] to include the file ' . $fileRef . ' instead.'); $ORarray = $this->readLLfile($GLOBALS['TYPO3_CONF_VARS']['BE']['XLLfile'][$parts[0]]); $this->LL_files_cache[$parts[0]] = t3lib_div::array_merge_recursive_overrule($this->LL_files_cache[$parts[0]],$ORarray); } @@ -415,6 +418,7 @@ // @deprecated since TYPO3 4.3, remove in TYPO3 4.5, please use the generic method in // t3lib_div::readLLfile and the global array $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride'] if (isset($GLOBALS['TYPO3_CONF_VARS']['BE']['XLLfile'][$fileRef])) { + t3lib_div::deprecationLog('Usage of $TYPO3_CONF_VARS[\'BE\'][\'XLLfile\'] is deprecated since TYPO3 4.3. Use $TYPO3_CONF_VARS[\'SYS\'][\'locallangXMLOverride\'][] to include the file ' . $fileRef . ' instead.'); $ORarray = $this->readLLfile($GLOBALS['TYPO3_CONF_VARS']['BE']['XLLfile'][$fileRef]); $LOCAL_LANG = t3lib_div::array_merge_recursive_overrule($LOCAL_LANG,$ORarray); }