Merge pull request #3393 from evazion/feat-safe-mode

Fix #3392: Add safe mode account setting.
This commit is contained in:
Albert Yi
2017-11-21 10:55:57 -08:00
committed by GitHub
6 changed files with 26 additions and 6 deletions

View File

@@ -265,6 +265,10 @@ class AnonymousUser
false
end
def enable_safe_mode?
false
end
User::Roles.reject {|r| r == :anonymous}.each do |name|
define_method("is_#{name}?") do
false

View File

@@ -74,11 +74,7 @@ class CurrentUser
end
def self.set_safe_mode(req)
if req.host =~ /safe/ || req.params[:safe_mode]
Thread.current[:safe_mode] = true
else
Thread.current[:safe_mode] = false
end
Thread.current[:safe_mode] = Danbooru.config.enable_safe_mode?(req, CurrentUser.user)
end
def self.method_missing(method, *params, &block)