[Rt-commit] r10071 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Mon Dec 24 18:47:10 2007
New Revision: 10071

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Template_Overlay.pm

Log:
 r9753 at cubic-pc (orig r9752):  ruz | 2007-11-28 11:51:56 +0300
 * fix memory leak


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Template_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Template_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Template_Overlay.pm	Mon Dec 24 18:47:10 2007
@@ -365,6 +365,15 @@
 
     $args{'Ticket'} = delete $args{'TicketObj'} if $args{'TicketObj'};
     $args{'Transaction'} = delete $args{'TransactionObj'} if $args{'TransactionObj'};
+    $args{'Requestor'} = eval { $args{'Ticket'}->Requestors->UserMembersObj->First->Name };
+    $args{'rtname'}    = RT->Config->Get('rtname');
+    if ( $args{'Ticket'} ) {
+        my $t = $args{'Ticket'}; # avoid memory leak
+        $args{'loc'} = sub { $t->loc(@_) };
+    } else {
+        $args{'loc'} = sub { $self->loc(@_) };
+    }
+
     foreach my $key ( keys %args ) {
         next unless ref $args{ $key };
         next if ref $args{ $key } =~ /^(ARRAY|HASH|SCALAR|CODE)$/;
@@ -372,13 +381,6 @@
         $args{ $key } = \$val;
     }
 
-    $args{'Requestor'} = eval { $args{'Ticket'}->Requestors->UserMembersObj->First->Name };
-    $args{'rtname'}    = RT->Config->Get('rtname');
-    if ( $args{'Ticket'} ) {
-        $args{'loc'} = sub { $args{'Ticket'}->loc(@_) };
-    } else {
-        $args{'loc'} = sub { $self->loc(@_) };
-    }
 
     my $is_broken = 0;
     my $retval = $template->fill_in(