[CLEANUP] Remove deprecated hook XLLfile
authorSteffen Gebert <steffen.gebert@typo3.org>
Sat, 9 Jul 2011 19:50:27 +0000 (21:50 +0200)
committerSusanne Moog <typo3@susannemoog.de>
Sat, 9 Jul 2011 20:00:42 +0000 (22:00 +0200)
Change-Id: Ic3cbd9ed35423081c713d3144d3cbbbed79e3d7f
Resolves: #28053
Relates: #21496
Reviewed-on: http://review.typo3.org/3214
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Susanne Moog
Tested-by: Susanne Moog
t3lib/config_default.php
typo3/sysext/lang/lang.php

index 03d8792..86b586f 100644 (file)
@@ -472,7 +472,6 @@ $TYPO3_CONF_VARS = array(
                '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(),                                   // @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' => 'checkbox',   // 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 6cff5fe..94b8491 100755 (executable)
@@ -400,15 +400,6 @@ class language {
                                                $tempLL = $this->readLLfile($lFileRef);
                                                $this->LL_files_cache[$parts[0]][$this->lang] = $tempLL[$this->lang];
                                        }
-
-                                               // 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);
-                                       }
                                }
                                $this->LL_labels_cache[$this->lang][$input] = $this->getLLL($parts[1], $this->LL_files_cache[$parts[0]]);
                        }