Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: absolute canonical link on topic pages

This commit is contained in:
Régis Hanol 2013-12-12 17:24:00 +01:00
parent dd93407789
commit c7741c9622
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/topics_controller.rb
View File

@ -1,7 +1,9 @@
require_dependency 'topic_view' require_dependency 'topic_view'
require_dependency 'promotion' require_dependency 'promotion'
require_dependency 'url_helper'
class TopicsController < ApplicationController class TopicsController < ApplicationController
include UrlHelper
before_filter :ensure_logged_in, only: [:timings, before_filter :ensure_logged_in, only: [:timings,
:destroy_timings, :destroy_timings,
@ -57,7 +59,7 @@ class TopicsController < ApplicationController
perform_show_response perform_show_response
canonical_url @topic_view.canonical_path canonical_url absolute(@topic_view.canonical_path)
end end
def wordpress def wordpress

1
lib/canonical_url.rb
View File

@ -12,7 +12,6 @@ module CanonicalURL
module Helpers module Helpers
def canonical_link_tag(url = nil) def canonical_link_tag(url = nil)
return '' unless url || @canonical_url return '' unless url || @canonical_url
tag('link', rel: 'canonical', href: url || @canonical_url || request.url) tag('link', rel: 'canonical', href: url || @canonical_url || request.url)
end end