Follow-up to #10597: Fixed wrong initialization of locallang file for admin panel...
authorOliver Hader <oliver.hader@typo3.org>
Tue, 2 Jun 2009 20:11:52 +0000 (20:11 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Tue, 2 Jun 2009 20:11:52 +0000 (20:11 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5532 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_adminpanel.php

index 25eee43..6111c79 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-02  Oliver Hader  <oliver@typo3.org>
+
+       * Follow-up to #10597: Fixed wrong initialization of locallang file for admin panel labels
+
 2009-06-02  Jeff Segars  <jeff@webempoweredchurch.org>
 
        * Follow-up to #10597: Removed hardcoded reference to fe_edit and updated extGetFeAdminValue() call to use tslib_AdminPanel
index 336a3cd..1ebfa8b 100644 (file)
@@ -265,6 +265,8 @@ class tslib_AdminPanel {
         * @return      string          HTML for the Admin Panel
         */
        public function display() {
+               $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_tsfe.php');
+
                $out = '<script type="text/javascript" src="t3lib/js/adminpanel.js"></script>';
                //CSS
                // @todo Check how this was handled before and if it's required here
@@ -828,14 +830,6 @@ $query . '
         * @return      string          The value for the $key
         */
        protected function extGetLL($key) {
-               global $LOCAL_LANG;
-               if (!is_array($LOCAL_LANG)) {
-                       $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_tsfe.php');
-                       if (!is_array($LOCAL_LANG)) {
-                               $LOCAL_LANG = array();
-                       }
-               }
-
                $labelStr = htmlspecialchars($GLOBALS['LANG']->getLL($key));    // Label string in the default backend output charset.
 
                        // Convert to utf-8, then to entities: