Index: typo3/sysext/cms/tslib/content/class.tslib_content_horizontalruler.php =================================================================== --- typo3/sysext/cms/tslib/content/class.tslib_content_horizontalruler.php (revision 9214) +++ typo3/sysext/cms/tslib/content/class.tslib_content_horizontalruler.php (revision ) @@ -42,33 +42,70 @@ * @return string Output */ public function render($conf = array()) { - $lineThickness = t3lib_div::intInRange($this->cObj->stdWrap($conf['lineThickness'], $conf['lineThickness.']), 1, 50); - $lineColor = $conf['lineColor'] ? $conf['lineColor'] : 'black'; - $spaceBefore = intval($conf['spaceLeft']); - $spaceAfter = intval($conf['spaceRight']); - $tableWidth = $conf['tableWidth'] ? $conf['tableWidth'] : '99%'; - $content = ''; - $content .= ''; + $lineThickness = isset($conf['lineThickness.']) + ? $this->cObj->stdWrap($conf['lineThickness'], $conf['lineThickness.']) + : $conf['lineThickness']; + $lineThickness = t3lib_div::intInRange($lineThickness, 1, 50); + + $lineColor = isset($conf['lineColor.']) + ? $this->cObj->stdWrap($conf['lineColor'], $conf['lineColor.']) + : $conf['lineColor']; + if(!$lineColor) + $lineColor = 'black'; + + $spaceBefore = isset($conf['spaceLeft.']) + ? intval($this->cObj->stdWrap($conf['spaceLeft'], $conf['spaceLeft.'])) + : intval($conf['spaceLeft']); + + $spaceAfter = isset($conf['spaceRight.']) + ? intval($this->cObj->stdWrap($conf['spaceRight'], $conf['spaceRight.'])) + : intval($conf['spaceRight']); + + $tableWidth = isset($conf['tableWidth.']) + ? intval($this->cObj->stdWrap($conf['tableWidth'], $conf['tableWidth.'])) + : intval($conf['tableWidth']); + if(!$tableWidth) + $tableWidth = '99%'; + + $theValue = ''; + + $theValue .= '
'; if ($spaceBefore) { - $content .= ''; + $theValue .= ''; } - $content .= ''; + $theValue .= ''; if ($spaceAfter) { - $content .= ''; + $theValue .= ''; } - $content .= '
+ + + + + +
'; + $theValue .= ''; - $content = $this->cObj->stdWrap($content, $conf['stdWrap.']); - return $content; + if (isset($conf['stdWrap.'])) { + $theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']); - } + } + return $theValue; + -} + } +} + if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_horizontalruler.php']) { include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_horizontalruler.php']); }