X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=01b9e8d4ad9132ca9a2e1e8089ef180839b0a1a1;hb=59c2b3bd20a496dceafecff5e231e46af51e8a69;hp=71ce8cce0070baa35e90db9a4b62015571c4170b;hpb=8e86b7f5eb874b84564daf83ffcf9f15e9964276;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 71ce8cc..01b9e8d 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -576,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 @@ -650,12 +655,12 @@ sub welcome_message {
-

$name on Catalyst +

$name on Catalyst $VERSION

- + Catalyst Logo

Welcome to the wonderful world of Catalyst. This MVC @@ -670,13 +675,13 @@ sub welcome_message { perldoc Catalyst::Manual

What to do next?

Next it's time to write an actual application. Use the - helper scripts to generate controllers, - models and - views, + helper scripts to generate controllers, + models and + views, they can save you a lot of work.

script/${prefix}_create.pl -help

Also, be sure to check out the vast and growing - collection of plugins for Catalyst on CPAN, + collection of plugins for Catalyst on CPAN, you are likely to find what you need there.

@@ -1558,7 +1563,12 @@ sub setup_log { $class->log( Catalyst::Log->new ); } - if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($class) . '_DEBUG' } || $debug ) { + + if ( $ENV{CATALYST_DEBUG} || + $ENV{ Catalyst::Utils->class2env($class) . '_DEBUG' } || + $debug && + $ENV{CATALYST_DEBUG} != 0 && + $ENV{ Catalyst::Utils->class2env($class).'_DEBUG' } != 0 ) { no strict 'refs'; *{"$class\::debug"} = sub { 1 }; $class->log->debug('Debug messages enabled');