Changeset 1221 for trunk/core/lib/Foswiki/UI/Save.pm

Timestamp:

12/09/08 18:16:48 (3 years ago)

Author:

CrawfordCurrie

Message:

Item253: remove TWikiDrawPlugin hack; analyse, rationalise and document usage of redirectto; Item5926: added encodings that were proposed to make chinese work (they don't break anything AFAICT). Deprecate Foswiki::Func::getRegularExpression (the regex array is published)

File:

• trunk/core/lib/Foswiki/UI/Save.pm (modified) (6 diffs)

trunk/core/lib/Foswiki/UI/Save.pm

@@ -441 +441 @@
         }
         my $viewURL = $session->getScriptUrl( 1, 'view', $w, $t );
-        $session->redirect( $viewURL, undef, 1 );
+        $session->redirect( $session->redirectto($viewURL) );
 
         return;
@@ -498 +498 @@
 
         # drop through
+    } else {
+         $redirecturl = $session->getScriptUrl( 1, 'view', $web, $topic );
+     }
+
+    # Do we have ?redirectto=
+    if ($saveaction ne 'checkpoint') {
+        $redirecturl = $session->redirectto($redirecturl);
     }
 
@@ -530 +537 @@
 
     #success - redirect to topic view (unless its a checkpoint save)
-    $redirecturl ||= $session->getScriptUrl( 1, 'view', $web, $topic );
 
     if ( $saveCmd eq 'delRev' ) {
@@ -548 +554 @@
         };
 
-        $session->redirect( $redirecturl, undef, 1 );
+        $session->redirect( $redirecturl );
         return;
     }
@@ -577 +583 @@
         };
 
-        $session->redirect( $redirecturl, undef,
-            ( $saveaction ne 'checkpoint' ) );
+        $session->redirect( $redirecturl);
         return;
     }
@@ -620 +625 @@
     }
 
-    $session->redirect( $redirecturl, undef, ( $saveaction ne 'checkpoint' ) );
+    $session->redirect( $redirecturl );
 }