logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: f8fe394e7a03edacb06c336b3990d6e488336361
parent: 2a545e0fb1d424270f79b01288f7436c4ff347ad
Author: ThibG <thib@sitedethib.com>
Date:   Sun, 11 Jun 2017 22:53:12 +0200

Fix an error when TagManager.local_url? is called with a bad URI (#3701)

TagManager.local_url? was sometimes called with an URI with a nil host,
leading to a crash in TagManager.local_url?. This fixes moves the
already-existing uri.host.blank? check in front to avoid this case.

Diffstat:

Mapp/services/fetch_link_card_service.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb @@ -36,7 +36,7 @@ class FetchLinkCardService < BaseService def bad_url?(uri) # Avoid local instance URLs and invalid URLs - TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme) || uri.host.blank? + uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme) end def skip_link?(a)