From d59106cb1596f905386c262822ba140d884e756b Mon Sep 17 00:00:00 2001
From: Nick Ivanter <nick@emcraft.com>
Date: Tue, 26 Apr 2016 19:18:34 +0400
Subject: [PATCH] FIX: duplicate subfolder prefix in links in digest (#4179)

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/...
---
 app/views/user_notifications/digest.html.erb | 8 ++++----
 lib/category_badge.rb                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index acf396294..3d7471f73 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -21,7 +21,7 @@
 
       <%- @featured_topics.each_with_index do |t, i| %>
         <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/>
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </div>
@@ -44,7 +44,7 @@
       <%- @new_topics.each do |t| %>
         <ul>
           <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>
             <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
           </li>
@@ -59,7 +59,7 @@
         <div>
         <%- @new_by_category.first(10).each do |c| %>
           <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>
         <%- end %>
       </div>
@@ -74,5 +74,5 @@
 <div class='footer'>
   <%=raw(t 'user_notifications.digest.unsubscribe',
            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>
diff --git a/lib/category_badge.rb b/lib/category_badge.rb
index 196d17691..dd1355f7b 100644
--- a/lib/category_badge.rb
+++ b/lib/category_badge.rb
@@ -60,7 +60,7 @@ module CategoryBadge
     class_names = 'badge-category clear-badge'
     text_color = "##{category.text_color}"
     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]
         case (SiteSetting.category_style || :box).to_sym