Follow-up to #15094: removed unused variable, resolved unknown variable

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

diff --git a/ChangeLog b/ChangeLog
index 3b5427d..517b728 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-25  Steffen Kamper  <steffen@typo3.org>
+
+       * Follow-up to #15094: removed unused variable, resolved unknown variable
+
 2010-11-25  Jigal van Hemert <jigal@xs4all.nl>
 
        * Fixed bug #14050: Cleanup - CGL format of t3lib files - t3lib_admin additional cleanup

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 279e21b..b2fac4d 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -232,11 +232,6 @@
  */
 class tslib_cObj {
 
-       /**
-        * @var tslib_content_abstract
-        */
-       protected $contentObject;
-
        var $align = array(
                'center',
                'right',
@@ -528,6 +523,9 @@ class tslib_cObj {
        protected $stdWrapHookObjects = array(); // Containing hook objects for stdWrap
        protected $getImgResourceHookObjects; // Containing hook objects for getImgResource
 
+       /**
+        * @var array with members of tslib_content_abstract
+        */
        protected $contentObjects = array();
 
        /**
@@ -7399,7 +7397,7 @@ class tslib_cObj {
                                        ' AND doktype NOT IN (' . $this->checkPid_badDoktypeList . ')'
                        );
                        if ($error = $GLOBALS['TYPO3_DB']->sql_error()) {
-                               $GLOBALS['TT']->setTSlogMessage($error . ': ' . $query, 3);
+                               $GLOBALS['TT']->setTSlogMessage($error . ': ' . $GLOBALS['TYPO3_DB']->debug_lastBuiltQuery, 3);
                        } else {
                                while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                                        $outArr[] = $row['uid'];