X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=b85ac7f3e50e124540f2b81594942d0f56a98a2a;hp=05824a6774a8bea5391b7bb0027f2a78496a38f5;hb=80cdbbff8f7c6b6c341e367fc780d4982b1ee54e;hpb=0e7f582624c1ab4eb82925efe1c539ba497142fe diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 05824a6..b85ac7f 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -38,7 +38,7 @@ our $DETACH = "catalyst_detach\n"; require Module::Pluggable::Fast; # Helper script generation -our $CATALYST_SCRIPT_GEN = 9; +our $CATALYST_SCRIPT_GEN = 10; __PACKAGE__->mk_classdata($_) for qw/components arguments dispatcher engine log/; @@ -426,6 +426,7 @@ sub uri_for { # massage match, empty if absolute path $match =~ s/^\///; $match .= '/' if $match; + $path ||= ''; $match = '' if $path =~ /^\//; $path =~ s/^\///; @@ -575,20 +576,24 @@ sub welcome_message { my $name = $c->config->{name}; my $logo = $c->uri_for('/static/images/catalyst_logo.png'); my $prefix = Catalyst::Utils::appprefix( ref $c ); + $c->response->content_type('text/html; charset=utf-8'); return <<"EOF"; - + + + + $name on Catalyst $VERSION