Fixed bug: stdWrap for imgMax is not taken into account.
authorIngmar Schlecht <ingmar.schlecht@typo3.org>
Sat, 20 Oct 2007 20:16:48 +0000 (20:16 +0000)
committerIngmar Schlecht <ingmar.schlecht@typo3.org>
Sat, 20 Oct 2007 20:16:48 +0000 (20:16 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-1@2597 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php

index 88cae19..c044f8b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * Fixed bug #5949: BE-Shortcut to Tools->User Admin returns error. (By 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: stdWrap for imgMax is not taken into account. (Thanks to Helmut Hummel)
 
 2007-10-19  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
index a6d234e..83dc456 100755 (executable)
@@ -760,7 +760,7 @@ class tslib_cObj {
 
                        $imgMax = intval($this->stdWrap($conf['imgMax'],$conf['imgMax.']));
                        if ($imgMax)    {
-                               $imgCount = t3lib_div::intInRange($imgCount,0,$conf['imgMax']); // reduces the number of images.
+                               $imgCount = t3lib_div::intInRange($imgCount,0,$imgMax); // reduces the number of images.
                        }
 
                        $imgPath = $this->stdWrap($conf['imgPath'],$conf['imgPath.']);
index 6da6533..1d9190c 100755 (executable)
@@ -430,7 +430,7 @@ class tx_cssstyledcontent_pi1 extends tslib_pibase {
                $imgCount = count($imgs) - $imgStart;
                $imgMax = intval($this->cObj->stdWrap($conf['imgMax'], $conf['imgMax.']));
                if ($imgMax)    {
-                       $imgCount = t3lib_div::intInRange($imgCount, 0, $conf['imgMax']);       // reduce the number of images.
+                       $imgCount = t3lib_div::intInRange($imgCount, 0, $imgMax);       // reduce the number of images.
                }
 
                $imgPath = $this->cObj->stdWrap($conf['imgPath'], $conf['imgPath.']);