X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=0e9ebc29341b8e36bebb77b838b3b0218a8a7636;hb=de19de2e6f40d9f8986df5e4f37dc8084a7c83ee;hp=ba30a6785dac9cba95d0c8ea86a7d6935b70fc12;hpb=51674a636e6cb030f3a45b24dbcf81ae9ebfc0bb;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index ba30a67..0e9ebc2 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -19,6 +19,8 @@ use Path::Class::Dir ();
use Path::Class::File ();
use Time::HiRes qw/gettimeofday tv_interval/;
use URI ();
+use URI::http;
+use URI::https;
use Scalar::Util qw/weaken blessed/;
use Tree::Simple qw/use_weak_refs/;
use Tree::Simple::Visitor::FindByUID;
@@ -61,7 +63,7 @@ __PACKAGE__->response_class('Catalyst::Response');
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.7008';
+our $VERSION = '5.7011';
sub import {
my ( $class, @arguments ) = @_;
@@ -109,7 +111,7 @@ documentation and tutorials.
### in lib/MyApp.pm
use Catalyst qw/-Debug/; # include plugins here as well
- ### In lib/MyApp/Controller/Root.pm (autocreated)
+ ### In lib/MyApp/Controller/Root.pm (autocreated)
sub foo : Global { # called for /foo, /foo/1, /foo/1/2, etc.
my ( $self, $c, @args ) = @_; # args are qw/1 2/ for /foo/1/2
$c->stash->{template} = 'foo.tt'; # set the template
@@ -343,7 +345,7 @@ sub stash {
my $c = shift;
if (@_) {
my $stash = @_ > 1 ? {@_} : $_[0];
- croak('stash takes a hash or hashref') unless ref $stash;
+ croak('stash takes a hash or hashref') unless ref $stash;
foreach my $key ( keys %$stash ) {
$c->{stash}->{$key} = $stash->{$key};
}
@@ -929,6 +931,7 @@ sub uri_for {
my $params =
( scalar @args && ref $args[$#args] eq 'HASH' ? pop @args : {} );
+ carp "uri_for called with undef argument" if grep { ! defined $_ } @args;
s/([^$URI::uric])/$URI::Escape::escapes{$1}/go for @args;
unshift(@args, $path);
@@ -990,8 +993,8 @@ sub welcome_message {
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
+
+
$name on Catalyst $VERSION