[BUGFIX] Missing parentheses in code break two stdWraps
authorMarkus Klein <klein.t3@mfc-linz.at>
Tue, 21 Jun 2011 14:24:51 +0000 (16:24 +0200)
committerSteffen Gebert <steffen.gebert@typo3.org>
Thu, 23 Jun 2011 16:37:13 +0000 (18:37 +0200)
Missing parentheses around isset() checks in string concatenation break
functionality.

Change-Id: I57fb20a425ce39990f56cee792857feae6700524
Resolves: #27409
Releases: 4.6, 4.5
Reviewed-on: http://review.typo3.org/2863
Reviewed-by: Stefan Neufeind
Reviewed-by: Christopher
Tested-by: Christopher
Reviewed-by: Mario Rimann
Reviewed-by: Tolleiv Nietsch
Reviewed-by: Steffen Gebert
Tested-by: Steffen Gebert
typo3/sysext/cms/tslib/class.tslib_content.php

index 070ab71..32c05a4 100644 (file)
@@ -3100,9 +3100,9 @@ class tslib_cObj {
                                : $conf['offsetWrap.']['tableParams'];
                }
                if ($conf['offsetWrap.']['tdParams'] || $conf['offsetWrap.']['tdParams.']) {
-                       $controlTable->tdParams = ' ' . isset($conf['offsetWrap.']['tdParams.'])
+                       $controlTable->tdParams = ' ' . (isset($conf['offsetWrap.']['tdParams.'])
                                ? $this->stdWrap($conf['offsetWrap.']['tdParams'], $conf['offsetWrap.']['tdParams.'])
-                               : $conf['offsetWrap.']['tdParams'];
+                               : $conf['offsetWrap.']['tdParams']);
                }
                $content = $controlTable->start($content, $conf['offsetWrap']);
                if ($conf['offsetWrap.']['stdWrap.']) {
@@ -4060,9 +4060,9 @@ class tslib_cObj {
                                                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['thumbnails']) {
                                                        $thumbSize = '';
                                                        if ($conf['icon_thumbSize'] || $conf['icon_thumbSize.']) {
-                                                               $thumbSize = '&size=' . isset($conf['icon_thumbSize.'])
+                                                               $thumbSize = '&size=' . (isset($conf['icon_thumbSize.'])
                                                                        ? $this->stdWrap($conf['icon_thumbSize'], $conf['icon_thumbSize.'])
-                                                                       : $conf['icon_thumbSize'];
+                                                                       : $conf['icon_thumbSize']);
                                                        }
                                                        $check = basename($theFile) . ':' . filemtime($theFile) . ':' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
                                                        $md5sum = '&md5sum=' . t3lib_div::shortMD5($check);