[Rt-commit] r19609 - rt/3.8/branches/forward-with-transaction/lib/RT

[falcone at bestpractical.com]

Author: falcone
Date: Fri May  8 18:05:23 2009
New Revision: 19609

Modified:
   rt/3.8/branches/forward-with-transaction/lib/RT/ObjectCustomFieldValue_Overlay.pm

Log:
Simplify and clarify filling in template params

Modified: rt/3.8/branches/forward-with-transaction/lib/RT/ObjectCustomFieldValue_Overlay.pm
==============================================================================
--- rt/3.8/branches/forward-with-transaction/lib/RT/ObjectCustomFieldValue_Overlay.pm	(original)
+++ rt/3.8/branches/forward-with-transaction/lib/RT/ObjectCustomFieldValue_Overlay.pm	Fri May  8 18:05:23 2009
@@ -219,17 +219,20 @@
     my $self = shift;
     my $url = shift;
 
-    my $id = $self->ObjectId;
-    my $content = join '', @{[$self->Content]};
+    my %placeholders = (
+        id          => $self->ObjectId,
+        CustomField => $self->Content,
+    );
 
     # default value, uri-escape
-    for ($id, $content) {
-        $_ = '' if !defined($_);
-        RT::Interface::Web::EscapeURI(\$_);
-    }
+    for my $key (keys %placeholders) {
+        my $value = $placeholders{$key};
+
+        $value = '' if !defined($value);
+        RT::Interface::Web::EscapeURI(\$value);
 
-    $url =~ s/__id__/$id/g;
-    $url =~ s/__CustomField__/$content/g;
+        $url =~ s/__${key}__/$value/g;
+    }
 
     return $url;
 }