diff --git a/app/controllers/published_pages_controller.rb b/app/controllers/published_pages_controller.rb index 4ce1177709..a51776ada6 100644 --- a/app/controllers/published_pages_controller.rb +++ b/app/controllers/published_pages_controller.rb @@ -31,7 +31,7 @@ class PublishedPagesController < ApplicationController @topic = pp.topic @canonical_url = @topic.url - @logo = SiteSetting.logo_small + @logo = SiteSetting.logo_small || SiteSetting.logo @site_url = Discourse.base_url @border_color = "#" + ColorScheme.base_colors["tertiary"] diff --git a/app/views/published_pages/show.html.erb b/app/views/published_pages/show.html.erb index 0f84c9c1fb..7cf3b07c0b 100644 --- a/app/views/published_pages/show.html.erb +++ b/app/views/published_pages/show.html.erb @@ -2,9 +2,11 @@
- - - + <%- if @logo.present? %> + + + + <%- end -%>

<%= @topic.title %>

@@ -23,4 +25,4 @@ <%= @topic.first_post.cooked.html_safe %> <%- end -%> - \ No newline at end of file + diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb index d5fed80819..5aa1470515 100644 --- a/spec/requests/published_pages_controller_spec.rb +++ b/spec/requests/published_pages_controller_spec.rb @@ -98,6 +98,16 @@ RSpec.describe PublishedPagesController do expect(response.status).to eq(200) end + it "works even if image logos are not available" do + SiteSetting.logo_small = nil + get published_page.path + expect(response.body).to include("") + + SiteSetting.logo = nil + get published_page.path + expect(response.body).not_to include("published-page-logo") + end + it "defines correct css classes on body" do get published_page.path expect(response.body).to include("")