aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-03-20 12:53:08 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-03-20 12:53:13 +1100
commite0b8e17152a751dad9b2ea97768f9635ede7e486 (patch)
tree3c7f8a3309c63b695f5f9c44054f2bfea3532878
parentf7878a229b597b5fc7ba8172c8e8c94a8fd9d7b6 (diff)
We've already removed the proxied admin interface (and ADMIN_PUBLIC_URL configuration setting)
-rw-r--r--config/initializers/alaveteli.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index fc58f1a7e..5781ff6aa 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -30,17 +30,6 @@ ALAVETELI_VERSION = '0.6.8'
# Domain for URLs (so can work for scripts, not just web pages)
ActionMailer::Base.default_url_options[:host] = AlaveteliConfiguration::domain
-# So that javascript assets use full URL, so proxied admin URLs read javascript OK
-if (AlaveteliConfiguration::domain != "")
- ActionController::Base.asset_host = Proc.new { |source, request|
- if ENV["RAILS_ENV"] != "test" && request.fullpath.match(/^\/admin\//)
- AlaveteliConfiguration::admin_public_url
- else
- AlaveteliConfiguration::domain
- end
- }
-end
-
# fallback locale and available locales
available_locales = AlaveteliConfiguration::available_locales.split(/ /)
default_locale = AlaveteliConfiguration::default_locale