github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: these should not have been class variables

Browse Source
This commit is contained in:
Régis Hanol 2017-05-11 10:03:28 +02:00
parent eabfc59d51
commit b2b10c0f3c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/upload_creator.rb
View File

@ -233,11 +233,11 @@ class UploadCreator
end
def max_image_size
@@max_image_size ||= SiteSetting.max_image_size_kb.kilobytes
@max_image_size ||= SiteSetting.max_image_size_kb.kilobytes
end
def max_image_pixels
@@max_image_pixels ||= SiteSetting.max_image_megapixels * 1_000_000
@max_image_pixels ||= SiteSetting.max_image_megapixels * 1_000_000
end
def pixels
@ -245,7 +245,7 @@ class UploadCreator
end
def allow_animation
@@allow_animation ||= @opts[:type] == "avatar" ? SiteSetting.allow_animated_avatars : SiteSetting.allow_animated_thumbnails
@allow_animation ||= @opts[:type] == "avatar" ? SiteSetting.allow_animated_avatars : SiteSetting.allow_animated_thumbnails
end
def svg_whitelist_xpath