Bug 993939: Bugzilla::User::Setting::groups() should use memcached

diff --git a/Bugzilla/Memcached.pm b/Bugzilla/Memcached.pm
index 819b6d8b6b971507fcf80e9941222dcb496a2e60..1464b6c003e33ac2fa9571da76d825df02af4c62 100644 (file)
--- 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 6b5d13cbed39235a849a0b5dc213b800c3b87d88..81ce228e700de03b0f0433f899f3681f208a4839 100644 (file)
--- 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({