1 files changed, 43 insertions, 12 deletions

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 4e51036a6..5d70cb73f 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -235,7 +235,8 @@ sub quoteUrls {
               ~<a href=\"mailto:$2\">$1$2</a>~igx;
 
     # attachment links
-    $text =~ s~\b(attachment\s*\#?\s*(\d+)(?:\s+\[details\])?)
+    # BMO: Bug 652332 dkl@mozilla.com 2011-07-20
+    $text =~ s~\b(attachment\s*\#?\s*(\d+)(?:\s+\[diff\])?(?:\s+\[details\])?)
               ~($things[$count++] = get_attachment_link($2, $1, $user)) &&
                ("\0\0" . ($count-1) . "\0\0")
               ~egmxi;
@@ -280,7 +281,7 @@ sub get_attachment_link {
     my $dbh = Bugzilla->dbh;
     $user ||= Bugzilla->user;
 
-    my $attachment = new Bugzilla::Attachment($attachid);
+    my $attachment = new Bugzilla::Attachment({ id => $attachid, cache => 1 });
 
     if ($attachment) {
         my $title = "";
@@ -297,19 +298,21 @@ sub get_attachment_link {
         $title = html_quote(clean_text($title));
 
         $link_text =~ s/ \[details\]$//;
+        $link_text =~ s/ \[diff\]$//;
         my $linkval = "attachment.cgi?id=$attachid";
 
-        # If the attachment is a patch, try to link to the diff rather
-        # than the text, by default.
+        # If the attachment is a patch and patch_viewer feature is
+        # enabled, add link to the diff.
         my $patchlink = "";
         if ($attachment->ispatch and Bugzilla->feature('patch_viewer')) {
-            $patchlink = '&amp;action=diff';
+            $patchlink = qq| <a href="${linkval}&amp;action=diff" title="$title">[diff]</a>|;
         }
 
         # Whitespace matters here because these links are in <pre> tags.
         return qq|<span class="$className">|
-               . qq|<a href="${linkval}${patchlink}" name="attach_${attachid}" title="$title">$link_text</a>|
+               . qq|<a href="${linkval}" name="attach_${attachid}" title="$title">$link_text</a>|
                . qq| <a href="${linkval}&amp;action=edit" title="$title">[details]</a>|
+               . qq|${patchlink}|
                . qq|</span>|;
     }
     else {
@@ -330,8 +333,8 @@ sub get_bug_link {
     $options->{user} ||= Bugzilla->user;
     my $dbh = Bugzilla->dbh;
 
-    if (defined $bug) {
-        $bug = blessed($bug) ? $bug : new Bugzilla::Bug($bug);
+    if (defined $bug && $bug ne '') {
+        $bug = blessed($bug) ? $bug : new Bugzilla::Bug({ id => $bug, cache => 1 });
         return $link_text if $bug->{error};
     }
 
@@ -555,10 +558,9 @@ $Template::Stash::SCALAR_OPS->{ 0 } =
 $Template::Stash::SCALAR_OPS->{ truncate } = 
   sub {
       my ($string, $length, $ellipsis) = @_;
-      $ellipsis ||= "";
-      
       return $string if !$length || length($string) <= $length;
-      
+
+      $ellipsis ||= '';
       my $strlen = $length - length($ellipsis);
       my $newstr = substr($string, 0, $strlen) . $ellipsis;
       return $newstr;
@@ -665,6 +667,18 @@ sub create {
                 $var =~ s/>/\\x3e/g;
                 return $var;
             },
+
+            # Sadly, different to the above. See http://www.json.org/ 
+            # for details.
+            json => sub {
+                my ($var) = @_;
+                $var =~ s/([\\\"\/])/\\$1/g;
+                $var =~ s/\n/\\n/g;
+                $var =~ s/\r/\\r/g;
+                $var =~ s/\f/\\f/g;
+                $var =~ s/\t/\\t/g;
+                return $var;
+            },
             
             # Converts data to base64
             base64 => sub {
@@ -927,7 +941,15 @@ sub create {
                     Bugzilla->fields({ by_name => 1 });
                 return $cache->{template_bug_fields};
             },
-            
+
+            # A general purpose cache to store rendered templates for reuse.
+            # Make sure to not mix language-specific data.
+            'template_cache' => sub {
+                my $cache = Bugzilla->request_cache->{template_cache} ||= {};
+                $cache->{users} ||= {};
+                return $cache;
+            },
+
             'css_files' => \&css_files,
             yui_resolve_deps => \&yui_resolve_deps,
 
@@ -974,6 +996,12 @@ sub create {
             'default_authorizer' => new Bugzilla::Auth(),
         },
     };
+    # Use a per-process provider to cache compiled templates in memory across
+    # requests.
+    my $provider_key = join(':', @{ $config->{INCLUDE_PATH} });
+    my $shared_providers = Bugzilla->process_cache->{shared_providers} ||= {};
+    $shared_providers->{$provider_key} ||= Template::Provider->new($config);
+    $config->{LOAD_TEMPLATES} = [ $shared_providers->{$provider_key} ];
 
     local $Template::Config::CONTEXT = 'Bugzilla::Template::Context';
 
@@ -1055,6 +1083,9 @@ sub precompile_templates {
     # If anything created a Template object before now, clear it out.
     delete Bugzilla->request_cache->{template};
 
+    # Clear out the cached Provider object
+    Bugzilla->process_cache->{shared_providers} = undef;
+
     print install_string('done') . "\n" if $output;
 }