Fixed few bugs regarding the charset changes just committed.

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

diff --git a/t3lib/class.t3lib_cs.php b/t3lib/class.t3lib_cs.php
index 6287040..c253e25 100755 (executable)
--- a/t3lib/class.t3lib_cs.php
+++ b/t3lib/class.t3lib_cs.php
@@ -1140,7 +1140,7 @@ class t3lib_cs {
                if ($i === false)       {       // $len outside actual string length
                        return $string;
                } else  {
-                       if (abs($len)<strlen($string))  {
+                       if (abs($len)<$this->strlen($charset,$string))  {       // Has to use ->strlen() - otherwise multibyte strings ending with a multibyte char will return true here (which is not a catastrophe, but...)
                                if ($len > 0)   {
                                        return substr($string,0,$i).$crop;
                                } else {
@@ -1148,7 +1148,6 @@ class t3lib_cs {
                                }
                        }
                }
-
                return $string;
        }
 

diff --git a/t3lib/class.t3lib_div.php b/t3lib/class.t3lib_div.php
index 5b80951..6c2574f 100755 (executable)
--- a/t3lib/class.t3lib_div.php
+++ b/t3lib/class.t3lib_div.php
@@ -518,7 +518,7 @@ class t3lib_div {
         */
        function fixed_lgd_cs($string,$chars)   {
                if (is_object($GLOBALS['LANG']))        {
-                       return $GLOBALS['LANG']->csConvObj->crop($this->charSet,$string,$chars,'...');
+                       return $GLOBALS['LANG']->csConvObj->crop($GLOBALS['LANG']->charSet,$string,$chars,'...');
                } else {
                        return t3lib_div::fixed_lgd($string, $chars);
                }