Fixed bug #16227: Optimize stdWrap usage for TypoScript content element HTML (Thanks...
authorSteffen Kamper <info@sk-typo3.de>
Wed, 3 Nov 2010 18:59:43 +0000 (18:59 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 3 Nov 2010 18:59:43 +0000 (18:59 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9261 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/content/class.tslib_content_html.php

index e4cc703..255e672 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-11-03  Steffen Kamper  <steffen@typo3.org>
 
+       * Fixed bug #16227: Optimize stdWrap usage for TypoScript content element HTML (Thanks to Jo Hasenau)
        * Fixed bug #16226: Optimize stdWrap usage for TypoScript content element HRULER (Thanks to Jo Hasenau)
        * Fixed bug #15995: Bug: doktype limitation is not applied to alternative page languages (pages_language_overlay) (Thanks to Andreas Kiessling)
        * Fixed bug #16225: Disable draft workspace and migrate it to a real workspace (Thanks to Tolleiv Nietsch)
index afc5c48..6acc6b1 100644 (file)
@@ -42,7 +42,19 @@ class tslib_content_Html extends tslib_content_Abstract {
         * @return      string          Output
         */
        public function render($conf = array()) {
-               return $this->cObj->stdWrap($conf['value'], $conf['value.']);
+
+               $theValue = $conf['value'];
+
+               if (isset($conf['value.'])) {
+                       $theValue = $this->cObj->stdWrap($theValue, $conf['value.']);
+               }
+
+               if (isset($conf['stdWrap.'])) {
+                       $theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']);
+               }
+
+               return $theValue;
+
        }
 
 }
@@ -52,4 +64,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/conte
        include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_html.php']);
 }
 
-?>
\ No newline at end of file
+?>