Merge pull request #4138 from NickIvanter/internal-links-issue

FIX: internal links in subfolder installs
This commit is contained in:
Neil Lalonde 2016-04-04 15:14:47 -04:00
commit 7899c2d86e

View file

@ -123,9 +123,11 @@ class TopicLink < ActiveRecord::Base
if Discourse.store.has_been_uploaded?(url)
internal = Discourse.store.internal?
elsif parsed.host == Discourse.current_hostname || !parsed.host
elsif (parsed.host == Discourse.current_hostname && parsed.path.start_with?(Discourse.base_uri)) || !parsed.host
internal = true
parsed.path.slice!(Discourse.base_uri)
route = Rails.application.routes.recognize_path(parsed.path)
# We aren't interested in tracking internal links to users