Fixed bug #16594: Slide doesn't work without collect (Thanks to Jo Hasenau)
authorErnesto Baschny <ernst@cron-it.de>
Wed, 1 Dec 2010 16:53:04 +0000 (16:53 +0000)
committerErnesto Baschny <ernst@cron-it.de>
Wed, 1 Dec 2010 16:53:04 +0000 (16:53 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9731 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index e00a96f..f64eb50 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-12-01  Ernesto Baschny  <ernst@cron-it.de>
 
        * Added Feature #15604: Install-Tool usability: db compare shows no errors when db-updates fail
+       * Fixed bug #16594: Slide doesn't work without collect (Thanks to Jo Hasenau)
 
 2010-12-01  Francois Suter  <francois@typo3.org>
 
index 765b774..7311621 100644 (file)
@@ -66,34 +66,36 @@ class tslib_content_Content extends tslib_content_Abstract {
                        $slide = isset($conf['slide.'])
                                ? intval($this->cObj->stdWrap($conf['slide'], $conf['slide.']))
                                : intval($conf['slide']);
-                       if(!$slide) {
+                       if (!$slide) {
                                $slide = 0;
                        }
 
-                       if(isset($conf['slide.'])) {
-                               $slideCollect = isset($conf['slide.']['collect.'])
-                                       ? intval($this->cObj->stdWrap($conf['slide.']['collect'], $conf['slide.']['collect.']))
-                                       : intval($conf['slide.']['collect']);
-                               if(!$slideCollect) {
-                                       $slideCollect = 0;
-                               }
+                       $slideCollect = isset($conf['slide.']['collect.'])
+                               ? intval($this->cObj->stdWrap($conf['slide.']['collect'], $conf['slide.']['collect.']))
+                               : intval($conf['slide.']['collect']);
+                       if (!$slideCollect) {
+                               $slideCollect = 0;
+                       }
 
-                               $slideCollectReverse = isset($conf['slide.']['collectReverse.'])
-                                       ? intval($this->cObj->stdWrap($conf['slide.']['collectReverse'], $conf['slide.']['collectReverse.']))
-                                       : intval($conf['slide.']['collectReverse']);
-                               $slideCollectReverse = $slideCollectReverse ? TRUE : FALSE;
+                       $slideCollectReverse = isset($conf['slide.']['collectReverse.'])
+                               ? intval($this->cObj->stdWrap($conf['slide.']['collectReverse'], $conf['slide.']['collectReverse.']))
+                               : intval($conf['slide.']['collectReverse']);
+                       $slideCollectReverse = $slideCollectReverse ? TRUE : FALSE;
 
-                               $slideCollectFuzzy = isset($conf['slide.']['collectFuzzy.'])
-                                       ? intval($this->cObj->stdWrap($conf['slide.']['collectFuzzy'], $conf['slide.']['collectFuzzy.']))
-                                       : intval($conf['slide.']['collectFuzzy']);
+                       $slideCollectFuzzy = isset($conf['slide.']['collectFuzzy.'])
+                               ? intval($this->cObj->stdWrap($conf['slide.']['collectFuzzy'], $conf['slide.']['collectFuzzy.']))
+                               : intval($conf['slide.']['collectFuzzy']);
 
-                               if(!$slideCollectFuzzy) {
-                                       $slideCollectFuzzy = FALSE;
-                               } else if ($slideCollect) {
-                                       $slideCollectFuzzy = TRUE;
-                               };
+                       if ($slideCollectFuzzy) {
+                               $slideCollectFuzzy = TRUE;
+                       } else {
+                               $slideCollectFuzzy = FALSE;
                        }
 
+                       if (!$slideCollect) {
+                               $slideCollectFuzzy = TRUE;
+                       };
+
                        $again = FALSE;
 
                        do {
@@ -166,7 +168,7 @@ class tslib_content_Content extends tslib_content_Abstract {
                $wrap = isset($conf['wrap.'])
                        ? $this->cObj->stdWrap($conf['wrap'],$conf['wrap.'])
                        : $conf['wrap'];
-               if($wrap) {
+               if ($wrap) {
                        $theValue = $this->cObj->wrap($theValue, $wrap);
                }