github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:34:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Topic#featured_link may contain more than a URL.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-12-11 16:27:33 +08:00
parent 3c56c9b637
commit 4bd5acec47
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/topic.rb
View File

@ -88,7 +88,7 @@ class Topic < ActiveRecord::Base
(!t.user_id || !t.user.staff?)
}
validates :featured_link, allow_nil: true, format: URI::regexp(%w(http https))
validates :featured_link, allow_nil: true, url: true
validate if: :featured_link do
errors.add(:featured_link, :invalid_category) unless !featured_link_changed? ||
Guardian.new.can_edit_featured_link?(category_id)
@ -1265,14 +1265,7 @@ SQL
end
def featured_link_root_domain
url = URI.extract(self.featured_link).first
begin
MiniSuffix.domain(URI.parse(url).hostname)
rescue URI::InvalidURIError => e
Rails.logger.warn("#{e.message}: #{e.backtrace.join("\n")}")
nil
end
MiniSuffix.domain(URI.parse(self.featured_link).hostname)
end
private