X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;fp=lib%2FCatalyst%2FController.pm;h=afa3e3f78b0cfb3b24d59600d370d1bc9f5e14ca;hp=28b54be238cb3529b6ce595dc25bf347191766f6;hb=976220fb6507cadfbeebdd98e30861e2636e9b14;hpb=f98182507920d5fd40007a4d0ed1bf083134eaea diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm index 28b54be..afa3e3f 100644 --- a/lib/Catalyst/Controller.pm +++ b/lib/Catalyst/Controller.pm @@ -458,7 +458,10 @@ sub _parse_Absolute_attr { shift->_parse_Global_attr(@_); } sub _parse_Local_attr { my ( $self, $c, $name, $value ) = @_; # _parse_attr will call _parse_Path_attr for us - return Path => $name; + return ( + 'Chained' => '/', + 'PathPart' => join( '/', $self->path_prefix($c), $name) + ); } sub _parse_Relative_attr { shift->_parse_Local_attr(@_); } @@ -466,14 +469,23 @@ sub _parse_Relative_attr { shift->_parse_Local_attr(@_); } sub _parse_Path_attr { my ( $self, $c, $name, $value ) = @_; $value = '' if !defined $value; - if ( $value =~ m!^/! ) { - return ( 'Path', $value ); + if ( $value =~ s!^/!! ) { + return ( + 'Chained' => '/', + 'PathPart' => $value + ); } elsif ( length $value ) { - return ( 'Path', join( '/', $self->path_prefix($c), $value ) ); + return ( + 'Chained' => '/', + 'PathPart' => join( '/', $self->path_prefix($c), $value ) + ); } else { - return ( 'Path', $self->path_prefix($c) ); + return ( + 'Chained' => '/', + 'PathPart' => $self->path_prefix($c) + ); } }