Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix build 

Follow-up to bd3c0dd59f.
This commit is contained in:
Dan Ungureanu 2020-07-30 13:10:16 +03:00
parent bd3c0dd59f
commit 5e2e374c72
No known key found for this signature in database
GPG Key ID: 0AA2A00D6ACC8B84
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@ -785,7 +785,9 @@ class ApplicationController < ActionController::Base
opts[:layout] = 'application' if opts[:layout] == 'no_ember' opts[:layout] = 'application' if opts[:layout] == 'no_ember'
end end
if !SiteSetting.login_required? || (current_user rescue false) @current_user = current_user rescue nil
if !SiteSetting.login_required? || @current_user
key = "page_not_found_topics" key = "page_not_found_topics"
if @topics_partial = Discourse.redis.get(key) if @topics_partial = Discourse.redis.get(key)
@topics_partial = @topics_partial.html_safe @topics_partial = @topics_partial.html_safe

2
app/views/exceptions/not_found.html.erb
View File

@ -1,7 +1,7 @@
<div class="page-not-found"> <div class="page-not-found">
<h1 class="title"><%= @title %></h1> <h1 class="title"><%= @title %></h1>
<%- if !current_user %> <%- if !@current_user %>
<a href="<%= path "/login" %>" class='btn btn-primary'><%= SvgSprite.raw_svg('fa-user') %><%= I18n.t('log_in') %></a> <a href="<%= path "/login" %>" class='btn btn-primary'><%= SvgSprite.raw_svg('fa-user') %><%= I18n.t('log_in') %></a>
<%- end %> <%- end %>