From 1b250f1e017c7f4e1fd6287a73a4e1e84537e061 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 30 Apr 2015 12:46:19 -0400
Subject: [PATCH] FIX: crawler pages and RSS had broken links for sites
 deployed to a subfolder with relative_url_root

---
 app/models/category.rb                 | 2 +-
 app/models/topic.rb                    | 4 ++--
 app/views/application/_header.html.erb | 2 +-
 app/views/categories/index.html.erb    | 2 +-
 app/views/layouts/application.html.erb | 2 +-
 app/views/layouts/crawler.html.erb     | 2 +-
 app/views/list/list.erb                | 9 +++++++++
 app/views/list/list.rss.erb            | 2 +-
 app/views/topics/show.html.erb         | 6 +++---
 app/views/topics/show.rss.erb          | 4 ++--
 10 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 91b247355..de46c3e19 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -373,7 +373,7 @@ SQL
   def url
     url = @@url_cache[self.id]
     unless url
-      url = "/c"
+      url = "#{Discourse.base_uri}/c"
       url << "/#{parent_category.slug}" if parent_category_id
       url << "/#{slug}"
       url.freeze
diff --git a/app/models/topic.rb b/app/models/topic.rb
index a61cc8196..899246f8c 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -685,7 +685,7 @@ class Topic < ActiveRecord::Base
   # NOTE: These are probably better off somewhere else.
   #       Having a model know about URLs seems a bit strange.
   def last_post_url
-    "/t/#{slug}/#{id}/#{posts_count}"
+    "#{Discourse.base_uri}/t/#{slug}/#{id}/#{posts_count}"
   end
 
   def self.url(id, slug, post_number=nil)
@@ -699,7 +699,7 @@ class Topic < ActiveRecord::Base
   end
 
   def relative_url(post_number=nil)
-    url = "/t/#{slug}/#{id}"
+    url = "#{Discourse.base_uri}/t/#{slug}/#{id}"
     url << "/#{post_number}" if post_number.to_i > 1
     url
   end
diff --git a/app/views/application/_header.html.erb b/app/views/application/_header.html.erb
index ddcb6da88..2fdcd3154 100644
--- a/app/views/application/_header.html.erb
+++ b/app/views/application/_header.html.erb
@@ -3,7 +3,7 @@
     <div class="contents">
       <div class="row">
         <div class="title span13">
-          <a href="/">
+          <a href="<%= path "/" %>">
             <%- if application_logo_url.present? %>
               <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo">
             <%- else %>
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 3ffbc4c59..142bc7d0a 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -3,7 +3,7 @@
   <% @list.categories.each do |c| %>
     <div class='category' itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
       <meta itemprop='url' content='<%= c.url %>'>
-      <h2><a href='/c/<%= c.slug.blank? ? c.id : c.slug %>' itemprop='item'>
+      <h2><a href='<%= c.url %>' itemprop='item'>
         <span itemprop='name'><%= c.name %></span>
       </a></h2>
       <span itemprop='description'><%= c.description %></span>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 12d954e73..479ee1f5a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -44,7 +44,7 @@
         <!-- :preload-content -->
         <footer>
           <nav itemscope itemtype='http://schema.org/SiteNavigationElement'>
-            <a href='/'><%= t 'home_title' %></a>
+            <a href='<%= path "/" %>'><%= t 'home_title' %></a>
             <%= link_to t('js.filters.categories.title'), main_app.categories_path %>
             <%= link_to t('guidelines_topic.title'), main_app.guidelines_path %>
             <%= link_to t('tos_topic.title'), main_app.tos_path %>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index bcfbf0bfb..5422506c7 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -26,7 +26,7 @@
     </div>
     <footer class="container">
       <nav itemscope itemtype='http://schema.org/SiteNavigationElement'>
-        <a href='/'><%= t 'home_title' %></a>
+        <a href='<%= path "/" %>'><%= t 'home_title' %></a>
         <%= link_to t('js.filters.categories.title'), main_app.categories_path %>
         <%= link_to t('guidelines_topic.title'), main_app.guidelines_path %>
         <%= link_to t('tos_topic.title'), main_app.tos_path %>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index c6ff86bb0..5647d6d1b 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -1,3 +1,12 @@
+<% if @category %>
+  <h1>
+    <%= link_to @category.url, itemprop: 'item' do %>
+      <span itemprop='name'><%= @category.name %></span>
+    <% end %>
+  </h1>
+  <br/>
+<% end %>
+
 <div class='topic-list' itemscope itemtype='http://schema.org/ItemList'>
   <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
   <% @list.topics.each_with_index do |t,i| %>
diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index 5116a1675..63684a5e8 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -11,7 +11,7 @@
       <lastBuildDate><%= @topic_list.topics.first.created_at.rfc2822 %></lastBuildDate>
       <atom:link href="<%= @atom_link %>" rel="self" type="application/rss+xml" />
       <% @topic_list.topics.each do |topic| %>
-        <% topic_url = Discourse.base_url + topic.relative_url -%>
+        <% topic_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? && SiteSetting.enable_names?)})" -%></author>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 11b16051f..13cb134c9 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -1,6 +1,6 @@
-<h2>
+<h1>
   <%= render_topic_title(@topic_view.topic) %>
-</h2>
+</h1>
 
 <div itemscope itemtype='http://schema.org/BreadcrumbList'>
   <% categories_breadcrumb(@topic_view.topic).each_with_index do |c,i| %>
@@ -19,7 +19,7 @@
     <% if (u = post.user) %>
       <div class='creator'>
         <span>
-          <a href='/users/<%= u.username %>'><b itemprop='author'><%= u.username %></b></a>
+          <a href='<%= Discourse.base_uri %>/users/<%= u.username %>'><b itemprop='author'><%= u.username %></b></a>
            <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
            <time datetime='<%= post.created_at.to_formatted_s(:iso8601) %>' itemprop='datePublished'>
              <%= post.created_at %>
diff --git a/app/views/topics/show.rss.erb b/app/views/topics/show.rss.erb
index be903c7a2..dbfda1d2e 100644
--- a/app/views/topics/show.rss.erb
+++ b/app/views/topics/show.rss.erb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <% topic_url = Discourse.base_url + @topic_view.relative_url %>
+    <% topic_url = @topic_view.relative_url %>
     <% lang = SiteSetting.find_by_name('default_locale').try(:value) %>
     <% site_email = SiteSetting.find_by_name('contact_email').try(:value) %>
     <title><%= @topic_view.title %></title>
@@ -31,7 +31,7 @@
         <link><%= post_url %></link>
         <pubDate><%= post.created_at.rfc2822 %></pubDate>
         <guid isPermaLink="false">post-<%= post.topic_id %>-<%= post.post_number %></guid>
-        <source url="<%= Discourse.base_url %><%= @topic_view.relative_url %>.rss"><%= @topic_view.title %></source>
+        <source url="<%= @topic_view.relative_url %>.rss"><%= @topic_view.title %></source>
       </item>
     <% end %>
   </channel>