Author: dom Date: 2006-04-21 10:18:17 +0100 (Fri, 21 Apr 2006) New Revision: 782

Added: trunk/t/68_bug_website_displayed.t Modified: trunk/Changes trunk/MANIFEST trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Template.pm trunk/wiki.cgi Log: Fix bug and release 0.54 (fixes #112)

Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/Changes 2006-04-21 09:18:17 UTC (rev 782) @@ -1,5 +1,8 @@ "#" items refer to tickets. See http://dev.openguides.org/report/9 for details.

+0.54 21 April 2006 + #112 Fixed website display bug introduced in 0.53. + 0.53 20 April 2006 Miscellanous fixes for mod_perl. #42 New "About" screen. Try action=about and action=about;format=rdf.

Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/MANIFEST 2006-04-21 09:18:17 UTC (rev 782) @@ -92,5 +92,6 @@ t/65_bug_metadata_escape.t t/66_bug_latlong_representation.t t/67_bug_first_version.t +t/68_bug_website_displayed.t t/templates/15_test.tt wiki.cgi

Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/PREREQUISITES 2006-04-21 09:18:17 UTC (rev 782) @@ -1,4 +1,4 @@ -Modules required by OpenGuides 0.53 +Modules required by OpenGuides 0.54 ===================================

Algorithm::Diff (version 0.13 or later. Note that the latest version uses

Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/lib/OpenGuides/Template.pm 2006-04-21 09:18:17 UTC (rev 782) @@ -297,7 +297,7 @@ my $website = $args{metadata} ? $metadata{website}[0] : $q->param("website"); my $formatted_website_text = ""; - if ( $website && $website != "http://" ) { + if ( $website && $website ne "http://" ) { $formatted_website_text = $class->format_website_text( formatter => $formatter, text => $website

Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/lib/OpenGuides.pm 2006-04-21 09:18:17 UTC (rev 782) @@ -14,7 +14,7 @@

use vars qw( $VERSION );

-$VERSION = '0.54-svn'; +$VERSION = '0.54';

=head1 NAME

Added: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/t/68_bug_website_displayed.t 2006-04-21 09:18:17 UTC (rev 782) @@ -0,0 +1,26 @@ +use CGI::Wiki::Setup::SQLite; +use OpenGuides; +use OpenGuides::Test; +use Test::More tests => 1; + +eval { require DBD::SQLite; }; +my $have_sqlite = $@ ? 0 : 1; + +SKIP: { + skip "DBD::SQLite not installed - no database to test with", 1 + unless $have_sqlite; + + CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + my $config = OpenGuides::Test->make_basic_config; + my $guide = OpenGuides->new( config => $config ); + + $guide->wiki->write_node( "South Croydon Station", "A sleepy main-line station in what is arguably the nicest part of Croydon.", undef, { website => "http://www.example.com/" } ) or die "Couldn't write node"; + + my $output = $guide->display_node( + id => "South Croydon Station", + return_output => 1, + ); + like( $output, qr#Website:</span> <a href="http://www.example.com/">http://www.example.com/</a>#, "website correctly displayed" ); +} +

Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/wiki.cgi 2006-04-21 09:18:17 UTC (rev 782) @@ -4,7 +4,7 @@ use warnings;

use vars qw( $VERSION ); -$VERSION = '0.54-svn'; +$VERSION = '0.54';

use CGI qw/:standard/; use CGI::Carp qw(croak);