X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=dbc5fdf9294b58bde8e682cbffb7a5e6f4583a7b;hp=b38be49f847921ba79d89f524a4460a64782a556;hb=b0ad47c12a21862b08d8e2942095065ac2f7edf2;hpb=7d665b582162163415de0d7579403218cf4e66a6 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index b38be49..dbc5fdf 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -1192,7 +1192,7 @@ sub uri_for { ( scalar @args && ref $args[$#args] eq 'HASH' ? pop @args : {} ); carp "uri_for called with undef argument" if grep { ! defined $_ } @args; - s/([^A-Za-z0-9\-_.!~*'()])/$URI::Escape::escapes{$1}/go for @args; + s/([^A-Za-z0-9\-_.!~*'()+])/$URI::Escape::escapes{$1}/go for @args; unshift(@args, $path); @@ -2504,7 +2504,7 @@ the plugin name does not begin with C. $plugins ||= []; my @plugins = map { s/\A\+// ? $_ : "Catalyst::Plugin::$_" } @$plugins; - + for my $plugin ( reverse @plugins ) { Class::MOP::load_class($plugin); my $meta = find_meta($plugin); @@ -2518,7 +2518,7 @@ the plugin name does not begin with C. grep { $_ && blessed($_) && $_->isa('Moose::Meta::Role') } map { find_meta($_) } @plugins; - + Moose::Util::apply_all_roles( $class => @roles ) if @roles; @@ -2777,7 +2777,7 @@ willert: Sebastian Willert =head1 LICENSE -This library is free software, you can redistribute it and/or modify it under +This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut