aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-12 11:49:43 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-12 11:49:43 -0700
commit1a4ea1bc97f5a4f22d02edd36e701b6e495cf776 (patch)
tree27f98d4186afc81cb4282629fe1a58f41785b702
parente9db21743b15f2c6e8dcbd18f420784c4e8de88d (diff)
parentf74692788914a95794e823d2ec40815319447131 (diff)
downloadrails-1a4ea1bc97f5a4f22d02edd36e701b6e495cf776.tar.gz
rails-1a4ea1bc97f5a4f22d02edd36e701b6e495cf776.tar.bz2
rails-1a4ea1bc97f5a4f22d02edd36e701b6e495cf776.zip
Merge pull request #2988 from guilleiguaran/remove-extra-line
Remove odd asignation
-rw-r--r--actionpack/lib/action_view/asset_paths.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb
index 73f4f8ee5f..1d968fc798 100644
--- a/actionpack/lib/action_view/asset_paths.rb
+++ b/actionpack/lib/action_view/asset_paths.rb
@@ -121,7 +121,6 @@ module ActionView
def relative_url_root
config = controller.config if controller.respond_to?(:config)
config ||= config.action_controller if config.action_controller.present?
- config ||= config
config.relative_url_root
end