diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-21 09:04:23 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-21 09:04:23 -0700 |
| commit | d09758c79fff462906b48dda6601ced25a8865da (patch) | |
| tree | c9b690fb6583f1cc59ce5331c81deb03838cdb0f | |
| parent | d5cc6f136f34a53aef16160e6af2b449201040ff (diff) | |
| parent | e0b8e17152a751dad9b2ea97768f9635ede7e486 (diff) | |
Merge remote-tracking branch 'openaustralia_github/rails-3-develop' into rails-3-develop
| -rw-r--r-- | config/initializers/alaveteli.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 6fcc9e50d..458201164 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -30,17 +30,6 @@ ALAVETELI_VERSION = '0.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 |