github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-19 23:55:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: canonical urls for category and topic pages was wrong when deployed to subfolder

Browse Source
This commit is contained in:
Neil Lalonde 2015-10-01 12:24:07 -04:00
parent c7b344b00f
commit dd0a7107a8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/list_controller.rb
View File

@ -84,7 +84,7 @@ class ListController < ApplicationController
end
define_method("category_#{filter}") do
canonical_url "#{Discourse.base_url}#{@category.url}"
canonical_url "#{Discourse.base_url_no_prefix}#{@category.url}"
self.send(filter, category: @category.id)
end
@ -93,7 +93,7 @@ class ListController < ApplicationController
end
define_method("parent_category_category_#{filter}") do
canonical_url "#{Discourse.base_url}#{@category.url}"
canonical_url "#{Discourse.base_url_no_prefix}#{@category.url}"
self.send(filter, category: @category.id)
end

2
app/controllers/topics_controller.rb
View File

@ -83,7 +83,7 @@ class TopicsController < ApplicationController
response.headers['X-Robots-Tag'] = 'noindex'
end
canonical_url UrlHelper.absolute_without_cdn("#{Discourse.base_uri}#{@topic_view.canonical_path}")
canonical_url UrlHelper.absolute_without_cdn(@topic_view.canonical_path)
perform_show_response

2
app/helpers/application_helper.rb
View File

@ -121,7 +121,7 @@ module ApplicationHelper
opts ||= {}
opts[:image] ||= "#{Discourse.base_url}#{SiteSetting.logo_small_url}"
opts[:url] ||= "#{Discourse.base_url}#{request.fullpath}"
opts[:url] ||= "#{Discourse.base_url_no_prefix}#{request.fullpath}"
# Use the correct scheme for open graph
if opts[:image].present? && opts[:image].start_with?("//")