From 77977dd32c728ef05d2f420ec8722bdc62706471 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sun, 13 Aug 2017 19:02:44 +0300 Subject: [PATCH] SECURITY: Do not show latest/top topics on 404 for login_required sites --- app/views/exceptions/not_found.html.erb | 44 +++++++++++++------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb index 1298ec5449d..64ffd293f98 100644 --- a/app/views/exceptions/not_found.html.erb +++ b/app/views/exceptions/not_found.html.erb @@ -2,28 +2,30 @@

<%= t 'page_not_found.title' %>

-
-
-

<%= t 'page_not_found.popular_topics' %>

- <% @top_viewed.each do |t| %> -
- <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %> -
- <% end %> -
- " class="btn"><%= t 'page_not_found.see_more' %>… +<% unless SiteSetting.login_required? && current_user.nil? %> +
+
+

<%= t 'page_not_found.popular_topics' %>

+ <% @top_viewed.each do |t| %> +
+ <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %> +
+ <% end %> +
+ " class="btn"><%= t 'page_not_found.see_more' %>… +
+
+

<%= t 'page_not_found.recent_topics' %>

+ <% @recent.each do |t| %> +
+ <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %> +
+ <% end %> +
+ " class="btn"><%= t 'page_not_found.see_more' %>… +
-
-

<%= t 'page_not_found.recent_topics' %>

- <% @recent.each do |t| %> -
- <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %> -
- <% end %> -
- " class="btn"><%= t 'page_not_found.see_more' %>… -
-
+<% end %> <%- unless @hide_google %>