mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 17:46:05 -05:00
Merge pull request #4039 from tgxworld/follow_redirects_when_downloading_favicon
FIX: Follow redirects when downloading favicons.
This commit is contained in:
commit
e8d4935a2c
1 changed files with 1 additions and 1 deletions
|
@ -101,7 +101,7 @@ class StaticController < ApplicationController
|
||||||
|
|
||||||
data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*30) do
|
data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*30) do
|
||||||
begin
|
begin
|
||||||
file = FileHelper.download(SiteSetting.favicon_url, 50.kilobytes, "favicon.png")
|
file = FileHelper.download(SiteSetting.favicon_url, 50.kilobytes, "favicon.png", true)
|
||||||
data = file.read
|
data = file.read
|
||||||
file.unlink
|
file.unlink
|
||||||
data
|
data
|
||||||
|
|
Loading…
Reference in a new issue