From d5a943fd132c95dde1874ed6404403d5c04fdd12 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 Dec 2016 08:59:43 +0000
Subject: [PATCH] Merged r16049 (#24156).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16093 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/group_builtin.rb | 4 ++--
 app/models/role.rb          | 4 ++--
 app/models/user.rb          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/group_builtin.rb b/app/models/group_builtin.rb
index 9cedb61df..29e1d8e2a 100644
--- a/app/models/group_builtin.rb
+++ b/app/models/group_builtin.rb
@@ -37,12 +37,12 @@ class GroupBuiltin < Group
   class << self
     def load_instance
       return nil if self == GroupBuiltin
-      instance = order('id').first || create_instance
+      instance = unscoped.order('id').first || create_instance
     end
 
     def create_instance
       raise 'The builtin group already exists.' if exists?
-      instance = new
+      instance = unscoped.new
       instance.lastname = name
       instance.save :validate => false
       raise 'Unable to create builtin group.' if instance.new_record?
diff --git a/app/models/role.rb b/app/models/role.rb
index 86fe73070..acf71c50e 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -279,9 +279,9 @@ private
   end
 
   def self.find_or_create_system_role(builtin, name)
-    role = where(:builtin => builtin).first
+    role = unscoped.where(:builtin => builtin).first
     if role.nil?
-      role = create(:name => name) do |r|
+      role = unscoped.create(:name => name) do |r|
         r.builtin = builtin
       end
       raise "Unable to create the #{name} role (#{role.errors.full_messages.join(',')})." if role.new_record?
diff --git a/app/models/user.rb b/app/models/user.rb
index 5209fcb46..e90b44738 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -745,9 +745,9 @@ class User < Principal
   # Returns the anonymous user.  If the anonymous user does not exist, it is created.  There can be only
   # one anonymous user per database.
   def self.anonymous
-    anonymous_user = AnonymousUser.first
+    anonymous_user = AnonymousUser.unscoped.first
     if anonymous_user.nil?
-      anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :login => '', :status => 0)
+      anonymous_user = AnonymousUser.unscoped.create(:lastname => 'Anonymous', :firstname => '', :login => '', :status => 0)
       raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
     end
     anonymous_user
-- 
2.39.5