Fixed bug #8360: locallang.xml charset convertion dont work for LOCAL_LANG['default']
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Mon, 12 May 2008 11:32:21 +0000 (11:32 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Mon, 12 May 2008 11:32:21 +0000 (11:32 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3645 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_div.php

index da9f449..287d644 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-11  Dmitry Dulepov  <dmitry@typo3.org>
+
+       * Fixed bug #8360: locallang.xml charset convertion dont work for LOCAL_LANG['default']
+
 2008-05-07  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #8351: RTE.classes configuration not honoured by htmlArea RTE Insert/modify link class selector
index 72a8cac..e992f98 100755 (executable)
@@ -4113,7 +4113,7 @@ final class t3lib_div {
                                        // converting the default language (English)
                                        // this needs to be done for a few accented loan words and extension names
                                        // NOTE: no conversion is done when in UTF-8 mode!
-                               if (is_array($LOCAL_LANG['default'] && $targetCharset!='utf-8'))        {
+                               if (is_array($LOCAL_LANG['default']) && $targetCharset != 'utf-8') {
                                        foreach ($LOCAL_LANG['default'] as &$labelValue)        {
                                                $labelValue = $csConvObj->utf8_decode($labelValue, $targetCharset);
                                        }