Fixed bug #13495: Workspace tiled Preview shows same version of Page
authorOliver Hader <oliver.hader@typo3.org>
Fri, 7 May 2010 12:44:42 +0000 (12:44 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Fri, 7 May 2010 12:44:42 +0000 (12:44 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-2@7557 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index 553541d..8fa2287 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-07  Oliver Hader  <oliver@typo3.org>
+
+       * Fixed bug #13495: Workspace tiled Preview shows same version of Page
+
 2010-05-05  Benjamin Mack  <benni@typo3.org>
 
        * Fixed bug #12470: PHP-5.3 error: function define_syslog_variables() is deprecated (Thanks to Rupert Germann)
index 398a8a9..5a00a61 100755 (executable)
@@ -439,7 +439,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
                                $GLOBALS['TT']->setTSlogMessage($warning,2);
                        } else {
                                $warning = '&no_cache=1 has been supplied, so caching is disabled! URL: "'.t3lib_div::getIndpEnv('TYPO3_REQUEST_URL').'"';
-                               $this->no_cache = $no_cache ? 1 : 0;
+                               $this->disableCache();
                        }
                        t3lib_div::sysLog($warning, 'cms', 2);
                }
@@ -825,7 +825,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
 
                                // If the front-end is showing a preview, caching MUST be disabled.
                        if ($this->fePreview)   {
-                               $this->set_no_cache();
+                               $this->disableCache();
                        }
                }
                $GLOBALS['TT']->pull();
@@ -4388,12 +4388,22 @@ if (version == "n3") {
                        $GLOBALS['TT']->setTSlogMessage($warning,2);
                } else {
                        $warning.= 'Caching is disabled!';
-                       $this->no_cache = 1;
+                       $this->disableCache();
                }
                t3lib_div::sysLog($warning, 'cms', 2);
        }
 
        /**
+        * Disables caching of the current page.
+        *
+        * @return void
+        * @internal
+        */
+       protected function disableCache() {
+               $this->no_cache = 1;
+       }
+
+       /**
         * Sets the cache-timeout in seconds
         *
         * @param       integer         cache-timeout in seconds