From 41cbe22c70d6e0299eacc0a09b68b8d1a52c17a4 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 10 Jul 2013 13:37:55 -0400
Subject: Bug 822980 - backport bug 815532 to bmo (Bugzilla::User objects
 should be cached where appropriate) r=glob

---
 Bugzilla/Component.pm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'Bugzilla/Component.pm')

diff --git a/Bugzilla/Component.pm b/Bugzilla/Component.pm
index ad5166a0f..0fe6fb25a 100644
--- a/Bugzilla/Component.pm
+++ b/Bugzilla/Component.pm
@@ -352,20 +352,18 @@ sub bug_ids {
 
 sub default_assignee {
     my $self = shift;
-
-    if (!defined $self->{'default_assignee'}) {
-        $self->{'default_assignee'} =
-            new Bugzilla::User($self->{'initialowner'});
-    }
-    return $self->{'default_assignee'};
+    return $self->{'default_assignee'}
+        ||= new Bugzilla::User({ id => $self->{'initialowner'}, cache => 1 });
 }
 
 sub default_qa_contact {
     my $self = shift;
 
     if (!defined $self->{'default_qa_contact'}) {
-        $self->{'default_qa_contact'} =
-            new Bugzilla::User($self->{'initialqacontact'});
+        my $params = $self->{'initialqacontact'}
+                     ? { id => $self->{'initialqacontact'}, cache => 1 }
+                     : $self->{'initialqacontact'};
+        $self->{'default_qa_contact'} = new Bugzilla::User($params);
     }
     return $self->{'default_qa_contact'};
 }
-- 
cgit v1.2.3-24-g4f1b