codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: duplicate subfolder prefix in links in digest (#4179)

Browse source 
In subfolder installs, the subfolder prefix was getting duplicated in topic and category links in the digest. E.g. http://example.com/forum/forum/t/...
This commit is contained in:
Nick Ivanter 2016-04-26 19:18:34 +04:00 committed by Robin Ward
parent 69f1ea027d
commit d59106cb15
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/user_notifications/digest.html.erb
View file

@ -21,7 +21,7 @@
<%- @featured_topics.each_with_index do |t, i| %> <%- @featured_topics.each_with_index do |t, i| %>
<div class='featured-topic'> <div class='featured-topic'>
<a href='<%= Discourse.base_url + t.relative_url %>' style='color: #<%= @anchor_color %>'><%= raw format_topic_title(t.title) %></a> <a href='<%= Discourse.base_url_no_prefix + t.relative_url %>' style='color: #<%= @anchor_color %>'><%= raw format_topic_title(t.title) %></a>
<br/> <br/>
<%= category_badge(t.category, inline_style: true, absolute_url: true) %> <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
</div> </div>
@ -44,7 +44,7 @@
<%- @new_topics.each do |t| %> <%- @new_topics.each do |t| %>
<ul> <ul>
<li> <li>
<a href='<%= Discourse.base_url + t.relative_url %>' style='color: #<%= @anchor_color %>'><%= raw format_topic_title(t.title) %></a> <a href='<%= Discourse.base_url_no_prefix + t.relative_url %>' style='color: #<%= @anchor_color %>'><%= raw format_topic_title(t.title) %></a>
<span class='post-count'><%= t.posts_count %></span> <span class='post-count'><%= t.posts_count %></span>
<%= category_badge(t.category, inline_style: true, absolute_url: true) %> <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
</li> </li>
@ -59,7 +59,7 @@
<div> <div>
<%- @new_by_category.first(10).each do |c| %> <%- @new_by_category.first(10).each do |c| %>
<span style='white-space: nowrap'> <span style='white-space: nowrap'>
<a href='<%= Discourse.base_url %><%= c[0].url %>' style='color: #<%= @anchor_color %>'><%= c[0].name %></b> <span style='color: #777; margin: 0 10px 0 5px; font-size: 0.9em;'> <%= c[1] %></span></a> <a href='<%= Discourse.base_url_no_prefix %><%= c[0].url %>' style='color: #<%= @anchor_color %>'><%= c[0].name %></b> <span style='color: #777; margin: 0 10px 0 5px; font-size: 0.9em;'> <%= c[1] %></span></a>
</span> </span>
<%- end %> <%- end %>
</div> </div>
@ -74,5 +74,5 @@
<div class='footer'> <div class='footer'>
<%=raw(t 'user_notifications.digest.unsubscribe', <%=raw(t 'user_notifications.digest.unsubscribe',
site_link: html_site_link(@anchor_color), site_link: html_site_link(@anchor_color),
unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url, key: @unsubscribe_key), {:style=>'color: #' + @anchor_color })) %> unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url_no_prefix, key: @unsubscribe_key), {:style=>'color: #' + @anchor_color })) %>
</div> </div>

2
lib/category_badge.rb
View file

@ -60,7 +60,7 @@ module CategoryBadge
class_names = 'badge-category clear-badge' class_names = 'badge-category clear-badge'
text_color = "##{category.text_color}" text_color = "##{category.text_color}"
description = category.description_text ? "title='#{category.description_text.html_safe}'" : '' description = category.description_text ? "title='#{category.description_text.html_safe}'" : ''
category_url = opts[:absolute_url] ? "#{Discourse.base_url}#{category.url}" : category.url category_url = opts[:absolute_url] ? "#{Discourse.base_url_no_prefix}#{category.url}" : category.url
extra_span_classes = if opts[:inline_style] extra_span_classes = if opts[:inline_style]
case (SiteSetting.category_style || :box).to_sym case (SiteSetting.category_style || :box).to_sym