Bug 732189 - Backport 731562 to bmo: Cache the global/user.html.tmpl template, r=glob

https://bugzilla.mozilla.org/show_bug.cgi?id=731562

2 files changed, 18 insertions, 1 deletions

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index a1a6944f0..f069b19d2 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -938,7 +938,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,
 
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index d6e343429..e9d2754f7 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -779,6 +779,15 @@ sub in_group_id {
     return grep($_->id == $id, @{ $self->groups }) ? 1 : 0;
 }
 
+# This is a helper to get all groups which have an icon to be displayed
+# besides the name of the commenter.
+sub groups_with_icon {
+    my $self = shift;
+
+    my @groups = grep { $_->icon_url } @{ $self->direct_group_membership };
+    return \@groups;
+}
+
 sub get_products_by_permission {
     my ($self, $group) = @_;
     # Make sure $group exists on a per-product basis.