* Fixed bug #0000123:

	The stdWrap-option "stripHtml" should come before the option "crop" because HTML-Tags are recognized as Text by the crop-option but getafterwards stript out. That produces a wrong textlength.
	Changed order of "crop" to after "stripHTML"
	Affected file: class.tslib_content.php

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

diff --git a/ChangeLog b/ChangeLog
index 7bd3b0e..908a88d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-09  Robert Lemke  <rl@robertlemke.de>
+
+       * Fixed bug #0000123:
+               The stdWrap-option "stripHtml" should come before the option "crop" because HTML-Tags are recognized as Text by the crop-option but getafterwards stript out. That produces a wrong textlength.
+               Changed order of "crop" to after "stripHTML"
+               Affected file: class.tslib_content.php
+
 2004-06-08  Robert Lemke  <rl@robertlemke.de>
 
        * Fixed bug #0000070: Number of files (file count) displayed in file list module was one number too high ("5 Files" although 4 only exist). Updated typo3/class.file_list.inc

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 2e82493..a7ffb2e 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -3004,9 +3004,9 @@ class tslib_cObj {
                                if ($conf['case']){$content=$this->HTMLcaseshift($content, $conf['case']);}
                                if ($conf['bytes']){$content=$this->bytes($content,$conf['bytes.']['labels']);}
                                if ($conf['substring']){$content=$this->substring($content,$conf['substring']);}
-                               if ($conf['crop']){$content=$this->crop($content, $conf['crop']);}
                                if ($conf['removeBadHTML'])     {$content = $this->removeBadHTML($content, $conf['removeBadHTML.']);}
                                if ($conf['stripHtml']){$content = strip_tags($content);}
+                               if ($conf['crop']){$content=$this->crop($content, $conf['crop']);}
                                if ($conf['rawUrlEncode']){$content = rawurlencode($content);}
                                if ($conf['htmlSpecialChars']){
                                        $content=htmlSpecialChars($content);