Fixed bug #15784: Resolve errors in tslib_content
authorSteffen Kamper <info@sk-typo3.de>
Wed, 6 Oct 2010 20:05:03 +0000 (20:05 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 6 Oct 2010 20:05:03 +0000 (20:05 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8994 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_content.php

index 5340510..ffc1aef 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-06  Steffen Kamper  <steffen@typo3.org>
+
+       * Fixed bug #15784: Resolve errors in tslib_content
+
 2010-10-06  Oliver Hader  <oliver@typo3.org>
 
        * Fixed bug #15461: RemoveXSS exposes XSS vulnerability for double encoded characters (thanks to Marcus Krause)
index c7738f8..e91d4e6 100644 (file)
@@ -1187,7 +1187,7 @@ class tslib_cObj {
                        $tableWidth = max($imageRowsFinalWidths) + $colspacing * ($colCount - 1) + $colCount * $border * $borderThickness * 2;
 
                                // make table for pictures
-                       $index = $imgStart;
+                       $index = $imgIndex = $imgStart;
 
                        $noRows = $this->stdWrap($conf['noRows'], $conf['noRows.']);
                        $noCols = $this->stdWrap($conf['noCols'], $conf['noCols.']);
@@ -6052,7 +6052,7 @@ class tslib_cObj {
                        // Strips profile information of image to save some space:
                if (isset($configuration['stripProfile'])) {
                        if ($configuration['stripProfile']) {
-                               $parameters = $gfxConf['im_stripProfileCommand'] . $parameters;
+                               $parameters = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_stripProfileCommand'] . $parameters;
                        } else {
                                $parameters .= '###SkipStripProfile###';
                        }
@@ -8505,12 +8505,13 @@ class tslib_cObj {
        function checkPidArray($listArr) {
                $outArr = array();
                if (is_array($listArr) && count($listArr)) {
-                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                       $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                                'uid',
                                'pages',
                                'uid IN (' . implode(',', $listArr) . ')' . $this->enableFields('pages') .
                                        ' AND doktype NOT IN (' . $this->checkPid_badDoktypeList . ')'
                        );
+                       $res = $GLOBALS['TYPO3_DB']->sql_query($query);
                        if ($error = $GLOBALS['TYPO3_DB']->sql_error()) {
                                $GLOBALS['TT']->setTSlogMessage($error . ': ' . $query, 3);
                        } else {