Follow-up to feature #9292: Fixed wrong disposal of global variables

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

diff --git a/ChangeLog b/ChangeLog
index ce5c0e8..2e3baea 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-01  Oliver Hader  <oliver@typo3.org>
+
+       * Follow-up to feature #9292: Fixed wrong disposal of global variables (thanks to Christian Kuhn)
+
 2009-09-01  Sebastian Kurfuerst  <sebastian@typo3.org>
 
        * Raised extbase and fluid versions from 844 to 1181 (and pointing to a tag now instead of a revision)

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 5ab208e..e7052bf 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -407,8 +407,8 @@ class tslib_cObj {
                if (!isset($this->getImgResourceHookObjects)) {
                        $this->getImgResourceHookObjects = array();
 
-                       if(is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['getImgResource'])) {
-                               foreach($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['getImgResource'] as $classData) {
+                       if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['getImgResource'])) {
+                               foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['getImgResource'] as $classData) {
                                        $hookObject = t3lib_div::getUserObj($classData);
 
                                        if(!($hookObject instanceof tslib_cObj_getImgResourceHook)) {