Author: earle
Date: 2005-06-14 13:03:05 +0100 (Tue, 14 Jun 2005)
New Revision: 651
Modified:
trunk/t/63_bug_map_link_no_address.t
Log:
match to current template content
Modified: trunk/t/63_bug_map_link_no_address.t
===================================================================
--- trunk/t/63_bug_map_link_no_address.t 2005-06-14 12:02:04 UTC (rev 650)
+++ trunk/t/63_bug_map_link_no_address.t 2005-06-14 12:03:05 UTC (rev 651)
@@ -21,6 +21,6 @@
id => "South Croydon Station",
return_output => 1,
);
- like( $output, qr/Map:/, "map link included when no address" );
+ like( $output, qr/Map of this place/, "map link included when no address" );
}
Author: dom
Date: 2005-06-13 01:38:45 +0100 (Mon, 13 Jun 2005)
New Revision: 649
Modified:
trunk/Changes
Log:
Changelog for redirection bug. Bad me.
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2005-06-13 00:37:56 UTC (rev 648)
+++ trunk/Changes 2005-06-13 00:38:45 UTC (rev 649)
@@ -24,6 +24,7 @@
class="metadata_label">.
Wanted pages listing now displays, and sorts by, the number of nodes
pointing to each node.
+ Prevent redirect loops.
0.47 15 January 2005
Fixed bug with list_all_versions for nodes with only one version.
Author: dom
Date: 2005-06-13 01:37:56 +0100 (Mon, 13 Jun 2005)
New Revision: 648
Modified:
trunk/lib/OpenGuides.pm
Log:
Fix redirection loops, RT #13205
Modified: trunk/lib/OpenGuides.pm
===================================================================
--- trunk/lib/OpenGuides.pm 2005-06-13 00:22:40 UTC (rev 647)
+++ trunk/lib/OpenGuides.pm 2005-06-13 00:37:56 UTC (rev 648)
@@ -170,13 +170,15 @@
$redirect =~ s/^\[\[//;
$redirect =~ s/\]\]\s*$//;
# See if this is a valid node, if not then just show the page as-is.
- if ( $wiki->node_exists($redirect) ) {
+ # Avoid loops by not generating redirects to the same node or the
+ # previous node.
+ if ( $wiki->node_exists($redirect) && $redirect != $id && $redirect != $oldid ) {
my $output = $self->redirect_to_node($redirect, $id);
return $output if $return_output;
print $output;
exit 0;
- }
}
+ }
my $content = $wiki->format($raw);
my $modified = $node_data{last_modified};
my %metadata = %{$node_data{metadata}};
Author: dom
Date: 2005-06-13 01:22:40 +0100 (Mon, 13 Jun 2005)
New Revision: 647
Modified:
trunk/lib/OpenGuides/Config.pm
Log:
copyright update
Modified: trunk/lib/OpenGuides/Config.pm
===================================================================
--- trunk/lib/OpenGuides/Config.pm 2005-06-05 23:45:48 UTC (rev 646)
+++ trunk/lib/OpenGuides/Config.pm 2005-06-13 00:22:40 UTC (rev 647)
@@ -230,7 +230,7 @@
=head1 COPYRIGHT
- Copyright (C) 2004 The OpenGuides Project. All Rights Reserved.
+ Copyright (C) 2004-2005 The OpenGuides Project. All Rights Reserved.
The OpenGuides distribution is free software; you can redistribute it
and/or modify it under the same terms as Perl itself.
Author: dom
Date: 2005-06-06 00:45:48 +0100 (Mon, 06 Jun 2005)
New Revision: 646
Modified:
trunk/README
trunk/lib/OpenGuides.pm
trunk/lib/OpenGuides/RDF.pm
trunk/lib/OpenGuides/Template.pm
Log:
copyright year update
Modified: trunk/README
===================================================================
--- trunk/README 2005-06-05 17:20:22 UTC (rev 645)
+++ trunk/README 2005-06-05 23:45:48 UTC (rev 646)
@@ -35,7 +35,7 @@
The OpenGuides Project (openguides-dev(a)openguides.org)
COPYRIGHT
- Copyright (C) 2003-2004 The OpenGuides Project. All Rights Reserved.
+ Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved.
The OpenGuides distribution is free software; you can redistribute it
and/or modify it under the same terms as Perl itself.
Modified: trunk/lib/OpenGuides/RDF.pm
===================================================================
--- trunk/lib/OpenGuides/RDF.pm 2005-06-05 17:20:22 UTC (rev 645)
+++ trunk/lib/OpenGuides/RDF.pm 2005-06-05 23:45:48 UTC (rev 646)
@@ -332,7 +332,7 @@
=head1 COPYRIGHT
- Copyright (C) 2003-2004 The OpenGuides Project. All Rights Reserved.
+ Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved.
This module is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/lib/OpenGuides/Template.pm
===================================================================
--- trunk/lib/OpenGuides/Template.pm 2005-06-05 17:20:22 UTC (rev 645)
+++ trunk/lib/OpenGuides/Template.pm 2005-06-05 23:45:48 UTC (rev 646)
@@ -492,7 +492,7 @@
=head1 COPYRIGHT
- Copyright (C) 2003-2004 The OpenGuides Project. All Rights Reserved.
+ Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved.
This module is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/lib/OpenGuides.pm
===================================================================
--- trunk/lib/OpenGuides.pm 2005-06-05 17:20:22 UTC (rev 645)
+++ trunk/lib/OpenGuides.pm 2005-06-05 23:45:48 UTC (rev 646)
@@ -910,7 +910,7 @@
=head1 COPYRIGHT
- Copyright (C) 2003-2004 The OpenGuides Project. All Rights Reserved.
+ Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved.
The OpenGuides distribution is free software; you can redistribute it
and/or modify it under the same terms as Perl itself.