Fixed bug: stdWrap for imgMax is not taken into account.

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2598 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 15f79de..f41d98d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
 2007-10-20  Ingmar Schlecht  <ingmar@typo3.org>
 
-       * Fixed bug #5949: BE-Shortcut to Tools->User Admin returns error (Thanks to Oliver Hader and Christian Kuhn)
-       * Fixed bug #6210: UserTSConfig value "options.moduleMenuCollapsable=0" does not work. (Thanks to Christian Kuhn)
+       * Fixed bug #5949: BE-Shortcut to Tools->User Admin returns error (Thanks to 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>
 

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index d6a8cc5..3287e38 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -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.']);

diff --git a/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php b/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
index 7dd1f7d..716be86 100755 (executable)
--- a/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+++ b/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
@@ -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.']);