IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Do not enable published page if secure media enabled (#11131)

Browse Source 
There are issues around displaying images on published pages when secure media is enabled. This PR temporarily makes it appear as if published pages are enabled if secure media is also enabled.
This commit is contained in:
Martin Brennan
2020-11-06 10:33:19 +10:00
committed by GitHub
parent 2d4455161b
commit 00c8f520e9
10 changed files with 76 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/serializers/topic_view_serializer.rb
View File

@@ -275,7 +275,10 @@ class TopicViewSerializer < ApplicationSerializer
end
def include_published_page?
SiteSetting.enable_page_publishing? && scope.is_staff? && object.published_page.present?
SiteSetting.enable_page_publishing? &&
scope.is_staff? &&
object.published_page.present? &&
!SiteSetting.secure_media
end
def thumbnails