diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index b8f5572981d..54625b51d55 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -1,7 +1,9 @@ require_dependency 'topic_view' require_dependency 'promotion' +require_dependency 'url_helper' class TopicsController < ApplicationController + include UrlHelper before_filter :ensure_logged_in, only: [:timings, :destroy_timings, @@ -57,7 +59,7 @@ class TopicsController < ApplicationController perform_show_response - canonical_url @topic_view.canonical_path + canonical_url absolute(@topic_view.canonical_path) end def wordpress diff --git a/lib/canonical_url.rb b/lib/canonical_url.rb index 0612c665010..6a159091393 100644 --- a/lib/canonical_url.rb +++ b/lib/canonical_url.rb @@ -12,7 +12,6 @@ module CanonicalURL module Helpers def canonical_link_tag(url = nil) - return '' unless url || @canonical_url tag('link', rel: 'canonical', href: url || @canonical_url || request.url) end