codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3121 from techAPJ/patch-1

Browse source 
FIX: full user names were showing up in crawlers and rss feeds in spite ...
This commit is contained in:
Régis Hanol 2015-01-22 18:28:50 +01:00
commit ea1d53f848
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/list/list.rss.erb
View file

@ -14,10 +14,10 @@
<% topic_url = Discourse.base_url + topic.relative_url -%>
<item>
<title><%= topic.title %></title>
<author><%= "no-reply@example.com (@#{topic.user.username}#{" #{topic.user.name}" if topic.user.name.present?})" -%></author>
<author><%= "no-reply@example.com (@#{topic.user.username}#{" #{topic.user.name}" if (topic.user.name.present? && SiteSetting.enable_names?)})" -%></author>
<category><%= topic.category.name %></category>
<description><![CDATA[
<p><%= t('author_wrote', author: link_to(topic.user.name, user_url(topic.user.username_lower))).html_safe %></p>
<p><%= t('author_wrote', author: link_to("@#{topic.user.username}", user_url(topic.user.username_lower))).html_safe %></p>
<blockquote>
<%= topic.posts.first.cooked.html_safe %>
</blockquote>

2
app/views/topics/plain.html.erb
View file

@ -11,7 +11,7 @@
<% @topic_view.posts.each do |post| %>
<% if post.user %>
<div class='creator'>
<b><%= post.user.username %></b> <%= "(#{post.user.name})" if SiteSetting.display_name_on_posts %> at <%= post.created_at.to_formatted_s(:long_ordinal) %> — #<%= post.post_number %>
<b><%= post.user.username %></b> <%= "(#{post.user.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names?) %> at <%= post.created_at.to_formatted_s(:long_ordinal) %> — #<%= post.post_number %>
</div>
<div class='post'>
<% if post.hidden %>

2
app/views/topics/show.html.erb
View file

@ -10,7 +10,7 @@
<% if post.user %>
<div class='creator'>
<b><%= post.user.username %></b>
<%= "(#{post.user.name})" if SiteSetting.display_name_on_posts %> —
<%= "(#{post.user.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names?) %> —
<%= post.created_at.to_formatted_s(:iso8601) %> —
#<%= post.post_number %>
</div>

4
app/views/topics/show.rss.erb
View file

@ -15,10 +15,10 @@
<% next unless post.user %>
<item>
<title><%= @topic_view.title %></title>
<author><%= "no-reply@example.com (@#{post.user.username}#{" #{post.user.name}" if post.user.name.present?})" -%></author>
<author><%= "no-reply@example.com (@#{post.user.username}#{" #{post.user.name}" if (post.user.name.present? && SiteSetting.enable_names?)})" -%></author>
<description><![CDATA[
<% post_url = Discourse.base_url + post.url %>
<p><%= t('author_wrote', author: link_to(post.user.name, user_url(post.user.username_lower))).html_safe %></p>
<p><%= t('author_wrote', author: link_to("@#{post.user.username}", user_url(post.user.username_lower))).html_safe %></p>
<blockquote>
<% if post.hidden %>
<%= t('flagging.user_must_edit').html_safe %>