Fixed bug #11890: t3lib_div::fixed_lgd_cs uses wrong charset in FE

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5904 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index dd2e12d..00bb0be 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 
 2009-09-06  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #11890: t3lib_div::fixed_lgd_cs uses wrong charset in FE
        * Added feature #11397: Add class for rendering HTML page in BE and FE
        * Updated swfobjects from version 2.1 to version 2.2
        * Added feature #11370: Inconsistent Login Screen doesn't show system required errors (thanks to Jens Hoffmann, Susanne Moog and Steffen Gebert)

diff --git a/t3lib/class.t3lib_div.php b/t3lib/class.t3lib_div.php
index 506dd4d..a9c1c39 100644 (file)
--- a/t3lib/class.t3lib_div.php
+++ b/t3lib/class.t3lib_div.php
@@ -624,7 +624,7 @@ final class t3lib_div {
                if (is_object($GLOBALS['LANG'])) {
                        return $GLOBALS['LANG']->csConvObj->crop($GLOBALS['LANG']->charSet, $string, $chars, $appendString);
                } elseif (is_object($GLOBALS['TSFE'])) {
-                       return $GLOBALS['TSFE']->csConvObj->crop($GLOBALS['TSFE']->charSet, $string, $chars, $appendString);
+                       return $GLOBALS['TSFE']->csConvObj->crop($GLOBALS['TSFE']->renderCharset, $string, $chars, $appendString);
                } else {
                                // this case should not happen
                        $csConvObj = t3lib_div::makeInstance('t3lib_cs');