CVS: phpwiki/lib Request.php,1.87,1.88

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29571/lib

Modified Files:
        Request.php 
Log Message:
fix redirect, 

Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -2 -b -p -d -r1.87 -r1.88
--- Request.php 8 Jan 2005 21:27:45 -0000       1.87
+++ Request.php 25 Jan 2005 07:00:23 -0000      1.88
@@ -143,5 +143,5 @@ class Request {
      * Set DISABLE_HTTP_REDIRECT = true then.
      */
-    function redirect($url, $noreturn=true) {
+    function redirect($url, $noreturn = true) {
         $bogus = defined('DISABLE_HTTP_REDIRECT') && DISABLE_HTTP_REDIRECT;
         
@@ -172,13 +172,13 @@ class Request {
 
         if ($noreturn) {
-            include_once('lib/Template.php');
-            $this->_is_buffering_output = false;
-            //$this->discardOutput(); // this prints the gzip headers
+            $this->discardOutput(); // This might print the gzip headers. Not 
good.
             $this->buffer_output(false);
+            
+            include_once('lib/Template.php');
             $tmpl = new Template('redirect', $this, array('REDIRECT_URL' => 
$url));
             $tmpl->printXML();
             $this->finish();
         }
-        else if ($bogus) {
+        elseif ($bogus) {
             // Safari needs window.location.href = targeturl
             return JavaScript("
@@ -1321,4 +1321,7 @@ class HTTP_ValidatorSet {
 
 // $Log$
+// Revision 1.88  2005/01/25 07:00:23  rurban
+// fix redirect,
+//
 // Revision 1.87  2005/01/08 21:27:45  rurban
 // Prevent from Overlarge session data crash



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl