Fixed Bug ##847: error in tslib_fe->getFromCache() (Thanks to Susanne Moog)

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

diff --git a/ChangeLog b/ChangeLog
index 6068336..bedb99b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-14  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed Bug ##847: error in tslib_fe->getFromCache() (Thanks to Susanne Moog)
+
 2008-09-14  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #9308: htmlArea RTE: link on colour name doesn't set colour

diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index 37afbd8..f99eedf 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -1871,7 +1871,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                                                $this->cacheContentFlag = 1;    // Setting flag, so we know, that some cached content has been loaded
                                                $this->cacheExpires = $row['expires'];
 
-                                               if ($this->TYPO3_CONF_VARS['FE']['debug'] || $this->config['config']['debug'])  {
+                                               if ($this->TYPO3_CONF_VARS['FE']['debug'] || (isset($this->config['config']['debug']) && $this->config['config']['debug'])) {
                                                        $dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'];
                                                        $timeFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'];