@@ -2,6 +2,8 @@ === Edge +* Adjust StandardTags#relative_url_for for case when relative_url_root +is nil. [Sean Cribbs] * Correct rendering error in extensions controller. [Sean Cribbs] * Correct typo in config/boot.rb. [Sean Cribbs] * Major refactoring and simplification of LoginSystem. [Sean Cribbs] CHANGELOG @@ -977,7 +977,7 @@ module StandardTags end def relative_url_for(url, request) - File.join(ActionController::Base.relative_url_root, url) + File.join(ActionController::Base.relative_url_root || '', url) end def absolute_path_for(base_path, new_path) app/models/standard_tags.rb @@ -83,7 +83,7 @@ module Spec page.request = ActionController::TestRequest.new(:sample_param => 'data') page.request.request_uri = @request_uri || page.url page.request.host = @host || test_host - ActionController::Base.relative_url_root = @relative_root || "" + ActionController::Base.relative_url_root = @relative_root page.response = ActionController::TestResponse.new if tag_content.nil? page.render spec/matchers/render_matcher.rb @@ -16,6 +16,11 @@ describe "Standard Tags" do end end + it "<r:url> with a nil relative URL root should scope to the relative root of /" do + ActionController::Base.relative_url_root = nil + page(:home).should render("<r:url />").as("/") + end + it '<r:url> with a relative URL root should scope to the relative root' do page(:home).should render("<r:url />").with_relative_root("/foo").as("/foo/") end spec/models/standard_tags_spec.rb 818ae3f91f2e1c095db9452960e11638d06d6f2c Sean Cribbs seancribbs@gmail.com http://github.com/pilu/radiant/commit/33c5e1f5ff0a7236fe850935d81f800d40cf8c57 33c5e1f5ff0a7236fe850935d81f800d40cf8c57 2009-02-25T19:03:57-08:00 2009-02-25T19:03:57-08:00 Adjust StandardTags#relative_url_for for case when relative_url_root is nil. 2b6ee0812bbac18bd12d960d517b7cb9a28d9be1 Sean Cribbs seancribbs@gmail.com