Changeset 392

Timestamp:

06/12/04 16:50:08 (5 years ago)

Author:

kake

Message:

Fix redirect bug.

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/OpenGuides.pm (modified) (3 diffs)
• t/54_redirect.t (added)
• wiki.cgi (modified) (4 diffs)

trunk/MANIFEST

@@ -60 +60 @@
 t/52_display_diffs.t
 t/53_show_index.t
+t/54_redirect.t
 t/61_bug_textareas.t
 t/62_bug_os_coords.t

trunk/lib/OpenGuides.pm

@@ -13 +13 @@
 use vars qw( $VERSION );
 
-$VERSION = '0.33_04';
+$VERSION = '0.33_05';
 
 =head1 NAME
@@ -155 +155 @@
         # See if this is a valid node, if not then just show the page as-is.
         if ( $wiki->node_exists($redirect) ) {
-            redirect_to_node($redirect);
+            my $output = $self->redirect_to_node($redirect);
+            return $output if $return_output;
+            print $output;
+            exit 0;
         }
     }
@@ -474 +477 @@
 }
 
+sub redirect_to_node {
+    my ($self, $node) = @_;
+    my $script_url = $self->config->{_}->{script_url};
+    my $script_name = $self->config->{_}->{script_name};
+    my $formatter = $self->wiki->formatter;
+    my $param = $formatter->node_name_to_node_param( $node );
+    return CGI->redirect( "$script_url$script_name?$param" );
+}
+
 sub get_cookie {
     my $self = shift;

trunk/wiki.cgi

@@ -5 +5 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.33_04';
+$VERSION = '0.33_05';
 
 use CGI qw/:standard/;
@@ -77 +77 @@
         my @nodes = $wiki->list_all_nodes();
         $node = $nodes[int(rand(scalar(@nodes) + 1)) + 1];
-        redirect_to_node($node);
+        $guide->redirect_to_node($node);
         exit 0;
     } elsif ($action eq 'find_within_distance') {
@@ -141 +141 @@
 ############################ subroutines ###################################
 
-sub redirect_to_node {
-    my $node = shift;
-    print $q->redirect("$script_url$script_name?" . $q->escape($formatter->node_name_to_node_param($node)));
-    exit 0;
-}
-
 sub show_userstats {
     my $username = shift;
@@ -336 +330 @@
 
     if ($written) {
-        redirect_to_node($node);
+        $guide->redirect_to_node($node);
     } else {
         my %node_data = $wiki->retrieve_node($node);