projects / Packages / TYPO3.CMS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3f2561)
Fixed page is being generated refresh behaviour
authorKarsten Dambekalns <karsten.dambekalns@typo3.org>
Tue, 13 Sep 2005 09:33:18 +0000 (09:33 +0000)
committerKarsten Dambekalns <karsten.dambekalns@typo3.org>
Tue, 13 Sep 2005 09:33:18 +0000 (09:33 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@790 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog patch | blob | history
typo3/sysext/cms/tslib/class.tslib_fe.php patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index afe1aa9..cd21aaa 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-13 Karsten Dambekalns <karsten@typo3.org>
+
+       * Fixed the page is being generated page refreshing to the wrong page when query parameters are used.
+
 2005-08-22 Martin Kutschker <martin.t.kutschker@blackbox.net>
 
        * Fixed bug #24: Modified the JS layer code so that GMENU_LAYERS work with Opera (3.8 patch port by Michael Stucki)
diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index 58d90ce..0bd32d8 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -2169,18 +2169,21 @@
                if (!$this->no_cache)   {
                        $seconds = 30;
                        $stdMsg = '
-                       <html>
-                               <head>
-                                       <title>'.htmlspecialchars($this->tmpl->printTitle($this->page['title'])).'</title>
-                                       <meta http-equiv="refresh" content="3; URL='.htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')).'" />
-                               </head>
-                               <body bgcolor="white">
-                                       <div align="center" style="font-family:Verdana,Arial,Helvetica" color="#cccccc">
-                                               <strong>Page is being generated.</strong><br />
-                                               If this message does not disappear within '.$seconds.' seconds, please reload.
-                                       </div>
-                               </body>
-                       </html>';
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+       <head>
+               <title>'.htmlspecialchars($this->tmpl->printTitle($this->page['title'])).'</title>
+               <script type="text/javascript">
+                       window.setTimeout("location.reload()", 3000);
+               </script>
+       </head>
+       <body style="background-color:white; font-family:Verdana,Arial,Helvetica; color:#cccccc; text-align:center;">
+               <strong>Page is being generated.</strong><br />
+               If this message does not disappear within '.$seconds.' seconds, please reload.
+       </body>
+</html>';
                        $temp_content = $this->config['config']['message_page_is_being_generated'] ? $this->config['config']['message_page_is_being_generated'] : $stdMsg;
 
                        $this->setPageCacheContent($temp_content, '', $GLOBALS['EXEC_TIME']+$seconds);
TYPO3 CMS Core Development