Fix #3603: Unable to view images on Hijiribe/Sonohara when Danbooru domain is blocked.

This commit is contained in:
evazion
2018-04-06 21:18:46 -05:00
parent 01eda51020
commit 1b14545d0d
4 changed files with 11 additions and 2 deletions

View File

@@ -172,6 +172,7 @@ class ApplicationController < ActionController::Base
def reset_current_user
CurrentUser.user = nil
CurrentUser.ip_addr = nil
CurrentUser.root_url = root_url
end
def set_started_at_session

View File

@@ -48,6 +48,14 @@ class CurrentUser
Thread.current[:current_ip_addr]
end
def self.root_url
Thread.current[:current_root_url] || "http://#{Danbooru.config.hostname}/"
end
def self.root_url=(root_url)
Thread.current[:current_root_url] = root_url
end
def self.id
if user.nil?
nil

View File

@@ -14,7 +14,7 @@ class StorageManager
end
def default_base_url
Rails.application.routes.url_helpers.root_url + "data"
CurrentUser.root_url + "data"
end
# Store the given file at the given path. If a file already exists at that