From bca18aa9bb484ec33f1e12ee9d7c52c19c57a582 Mon Sep 17 00:00:00 2001
From: vitalif <vitalif@2be256b4-0725-11dc-8e68-8b2fc2fe2491>
Date: Fri, 26 Dec 2008 23:40:58 +0000
Subject: [PATCH] fix template bug

---
 VMX/Template.pm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/VMX/Template.pm b/VMX/Template.pm
index 3a2249a..295fb8e 100644
--- a/VMX/Template.pm
+++ b/VMX/Template.pm
@@ -218,7 +218,6 @@ sub append_block_vars
     my $block = shift;
     my %vararray = @_;
     my $lastit;
-
     if (!$block || $block eq '.')
     {
         # если не блок, а корневой уровень
@@ -230,6 +229,7 @@ sub append_block_vars
         $block =~ s/\.*$/./; # добавляем . в конец, если надо
         $self->{_tpldata}{$block} ||= [];
         $lastit = @{$self->{_tpldata}{$block}} - 1;
+        $lastit = 0 if $lastit < 0;
         $self->{_tpldata}{$block}[$lastit]{$_} = $vararray{$_}
             foreach keys %vararray;
     }
@@ -279,17 +279,17 @@ sub tr_assign_block_vars
 {
     my $self = shift;
     my $block = shift;
-    $self->assign_block_vars($block, $self->tr_vars($@));
+    $self->assign_block_vars($block, $self->tr_vars(@_));
 }
 
 ##
  # Аналог append_block_vars, но преобазует имена переменных
  ##
-sub tr_assign_block_vars
+sub tr_append_block_vars
 {
     my $self = shift;
     my $block = shift;
-    $self->append_block_vars($block, $self->tr_vars($@));
+    $self->append_block_vars($block, $self->tr_vars(@_));
 }
 
 ##
@@ -302,7 +302,15 @@ sub tr_vars
     my $prefix = shift;
     my %h = ();
     my ($k, $v);
-    $tr = eval '\&'.$tr if $tr && ref($tr) ne 'CODE';
+    if ($tr && !ref($tr))
+    {
+        unless ($self->{_tr_subroutine_cache}->{$tr})
+        {
+            # делаем так, чтобы всякие uc, lc и т.п работали
+            $self->{_tr_subroutine_cache}->{$tr} = eval 'sub { '.$tr.'($_[0]) }';
+        }
+        $tr = $self->{_tr_subroutine_cache}->{$tr};
+    }
     while(@_)
     {
         $k = shift;