IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: emoji's url were relatives (was breaking the wordpress plugin)

Browse Source
This commit is contained in:
Régis Hanol 2014-01-14 23:51:36 +01:00
parent c82279b9bd
commit b024bebbe2
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/url_helper.rb
View File

@ -3,6 +3,7 @@ module UrlHelper
def is_local(url) def is_local(url)
Discourse.store.has_been_uploaded?(url) || Discourse.store.has_been_uploaded?(url) ||
url =~ /^\/assets\// || url =~ /^\/assets\// ||
url =~ /^\/plugins\// ||
url.start_with?(Discourse.asset_host || Discourse.base_url_no_prefix) url.start_with?(Discourse.asset_host || Discourse.base_url_no_prefix)
end end

7
spec/components/url_helper_spec.rb
View File

@ -25,6 +25,13 @@ describe UrlHelper do
helper.is_local("/assets/javascripts/all.js").should be_true helper.is_local("/assets/javascripts/all.js").should be_true
end end
it "is true for plugin assets" do
store = stub
store.expects(:has_been_uploaded?).returns(false)
Discourse.stubs(:store).returns(store)
helper.is_local("/plugins/all.js").should be_true
end
end end
describe "#absolute" do describe "#absolute" do