From 93611337f4eb6c5aa8a4271330680fd5fdefe724 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Wed, 28 May 2014 14:36:41 +0800
Subject: [PATCH] Bug 993939: Bugzilla::User::Setting::groups() should use
 memcached

---
 .gitrev               | 2 +-
 Bugzilla/Memcached.pm | 2 +-
 Bugzilla/User.pm      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitrev b/.gitrev
index 8153d9375..98a8fd902 100644
--- a/.gitrev
+++ b/.gitrev
@@ -1 +1 @@
-6d730fae2211b9319037b7cb0515351fa529e78c
\ No newline at end of file
+b5b5061ca90acd1e65fc5e2073dedf721117e553
\ No newline at end of file
diff --git a/Bugzilla/Memcached.pm b/Bugzilla/Memcached.pm
index 819b6d8b6..1464b6c00 100644
--- a/Bugzilla/Memcached.pm
+++ b/Bugzilla/Memcached.pm
@@ -166,11 +166,11 @@ sub clear_all {
 
 sub clear_config {
     my ($self, $args) = @_;
+    return unless $self->{memcached};
     if ($args && exists $args->{key}) {
         $self->_delete($self->_config_prefix . '.' . $args->{key});
     }
     else {
-        return unless $self->{memcached};
         $self->_inc_prefix("config");
     }
 }
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 6b5d13cbe..81ce228e7 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -668,8 +668,8 @@ sub flush_queries_cache {
 sub groups {
     my $self = shift;
 
-    return [] unless $self->id;
     return $self->{groups} if defined $self->{groups};
+    return [] unless $self->id;
 
     my $user_groups_key = "user_groups." . $self->id;
     my $groups = Bugzilla->memcached->get_config({