[Jifty-commit] r4369 - in Template-Declare: lib/Template
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Nov 3 16:51:13 EDT 2007
Author: sterling
Date: Sat Nov 3 16:51:13 2007
New Revision: 4369
Modified:
Template-Declare/ (props changed)
Template-Declare/lib/Template/Declare.pm
Log:
r13847 at dynpc145: andrew | 2007-11-03 15:51:01 -0500
Fix a problem with alias template resolution were similar path endings were mishandled.
Modified: Template-Declare/lib/Template/Declare.pm
==============================================================================
--- Template-Declare/lib/Template/Declare.pm (original)
+++ Template-Declare/lib/Template/Declare.pm Sat Nov 3 16:51:13 2007
@@ -442,15 +442,16 @@
my $template_name = shift;
my $show_private = shift;
+ # XXX Should we consider normalizing the path in a more standard way?
+ $template_name = "/$template_name" unless $template_name =~ m{^/};
+
foreach my $alias_key ( @{ Template::Declare->aliases->{$package} } ) {
my $alias_info = $package->alias_metadata()->{$alias_key};
my $alias_prefix = $alias_info->{path};
my $alias_class = $alias_info->{class};
my $package_vars = $alias_info->{package_vars};
- $template_name = "/$template_name";
-
- if ( $template_name =~ m{$alias_prefix/(.*)$} ) {
+ if ( $template_name =~ m{^$alias_prefix/(.*)$} ) {
my $dispatch_to_template = $1;
if (my $coderef = $alias_class->resolve_template( $dispatch_to_template, $show_private)) {
More information about the Jifty-commit
mailing list