* Fixed bug #6553: Remove hardcoded strip_tags() from image altText and replacing...

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

diff --git a/ChangeLog b/ChangeLog
index bfa9419..f87dfce 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
        * Fixed bug #5949: BE-Shortcut to Tools->User Admin returns error (Thanks to Oliver Hader)
        * Fixed bug #6210: UserTSConfig value "options.moduleMenuCollapsable=0" does not work.
        * Fixed bug #6071: Switch to User does not work from context menu in List Module. (Thanks to Christian Kuhn all patches above!)
+       * Fixed bug #6553: Remove hardcoded strip_tags() from image altText and replacing it with TS stripHtml = 1 (Thanks to Georg Ringer)
        * Fixed bug: stdWrap for imgMax is not taken into account. (Thanks to Helmut Hummel)
 
 2007-10-19  Stanislas Rolland  <stanislas.rolland@fructifor.ca>

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 3287e38..1814615 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -2785,7 +2785,7 @@ class tslib_cObj {
                $longDesc = trim($this->stdWrap($conf['longdescURL'],$conf['longdescURL.']));
 
                        // "alt":
-               $altParam = ' alt="'.htmlspecialchars(strip_tags($altText)).'"';
+               $altParam = ' alt="'.htmlspecialchars($altText).'"';
 
                        // "title":
                $emptyTitleHandling = 'useAlt';
@@ -2794,9 +2794,9 @@ class tslib_cObj {
                        $emptyTitleHandling = $conf['emptyTitleHandling'];
                }
                if ($titleText || $emptyTitleHandling == 'keepEmpty')   {
-                       $altParam.= ' title="'.htmlspecialchars(strip_tags($titleText)).'"';
+                       $altParam.= ' title="'.htmlspecialchars($titleText).'"';
                } elseif (!$titleText && $emptyTitleHandling == 'useAlt')       {
-                       $altParam.= ' title="'.htmlspecialchars(strip_tags($altText)).'"';
+                       $altParam.= ' title="'.htmlspecialchars($altText).'"';
                }
 
                        // "longDesc" URL

diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index bb4f676..b2d83b1 100755 (executable)
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -390,6 +390,7 @@ tt_content.image.20 {
                altText = TEXT
                altText {
                        field = altText
+                       stripHtml = 1
                        split.token.char = 10
                        split.token.if.isTrue = {$styles.content.imgtext.imageTextSplit}
                        split.returnKey.data = register : IMAGE_NUM_CURRENT