Refactor redirect quiet.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4609 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 4 insertions, 9 deletions

diff --git a/pmwiki.php b/pmwiki.php
index 2060fb2e..617385e8 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -2006,9 +2006,8 @@ function RedirectMarkup($pagename, $opt) {
      header("HTTP/1.1 {$opt['status']}");
   $equiet = IsEnabled($EnableRedirectQuiet, 0);
   $oquiet = isset($opt['quiet']) ? intval($opt['quiet']) : -1;
-  $from = ($equiet == 2 && $oquiet != 0 || $equiet && $oquiet>0) ? '' : "?from=$pagename";
-  pmsetcookie('redirectedFrom', $pagename, time()+1, '/');
-  Redirect($to, "{\$PageUrl}$from$anchor");
+  $quiet = ($equiet == 2 && $oquiet != 0 || $equiet && $oquiet>0) ? '&quiet=1' : '';
+  Redirect($to, "{\$PageUrl}?from=$pagename$quiet$anchor");
   exit();
 }
 
@@ -2425,15 +2424,11 @@ function HandleBrowse($pagename, $auth = 'read') {
     $PageRedirectFmt = '';
   }
   else {
-    $from = @$_COOKIE['redirectedFrom']? $_COOKIE['redirectedFrom'] : $_GET['from'];
+    $from = $_GET['from'];
     $frompage = MakePageName($pagename, $from);
-    $PageRedirectFmt = (!$frompage) ? ''
+    $PageRedirectFmt = (!$frompage || @$_GET['quiet']) ? ''
       : FmtPageName($PageRedirectFmt, $frompage);
   }
-  if(@$_COOKIE['redirectedFrom']) {
-    pmsetcookie('redirectedFrom', '', time()-43200, '/');
-    unset($opt['redirect']); 
-  }
   if (@$EnableHTMLCache && !$NoHTMLCache && $PageCacheFile && 
       @filemtime($PageCacheFile) > $LastModTime) {
     list($ctext) = unserialize(file_get_contents($PageCacheFile));