diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-23 15:05:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 15:05:00 -0600 |
| commit | f53953d28a24fe65f1ca66d85a1416ba30dcda86 (patch) | |
| tree | 4e9e2214629b46ddc98fdce358abc812112f13fa /app/presenters | |
| parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
| parent | f2f19e1f8a3a048cf0a0041ae54d912acfea7742 (diff) | |
Merge pull request #369 from KnzkDev/merge-upstream
Merge with upstream @ e668180044560e28bdc5eef94744c210013efcda
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/account_relationships_presenter.rb | 2 | ||||
| -rw-r--r-- | app/presenters/instance_presenter.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb index d27fb7b01..b1e99b31b 100644 --- a/app/presenters/account_relationships_presenter.rb +++ b/app/presenters/account_relationships_presenter.rb @@ -45,7 +45,7 @@ class AccountRelationshipsPresenter maps_for_account = Rails.cache.read("relationship:#{@current_account_id}:#{account_id}") if maps_for_account.is_a?(Hash) - @cached.merge!(maps_for_account) + @cached.deep_merge!(maps_for_account) else @uncached_account_ids << account_id end diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb index 1c08fb3bc..db288d5db 100644 --- a/app/presenters/instance_presenter.rb +++ b/app/presenters/instance_presenter.rb @@ -48,4 +48,8 @@ class InstancePresenter def thumbnail @thumbnail ||= Rails.cache.fetch('site_uploads/thumbnail') { SiteUpload.find_by(var: 'thumbnail') } end + + def hero + @hero ||= Rails.cache.fetch('site_uploads/hero') { SiteUpload.find_by(var: 'hero') } + end end |