Fix #3392: Add safe mode account setting.

2017-11-20 18:33:59 -06:00
parent 05dea309b2
commit df7648b581
6 changed files with 26 additions and 6 deletions
--- a/app/logical/current_user.rb
+++ b/app/logical/current_user.rb
@@ -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)