diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
| commit | cbdff06aa95a7987b54c712dc6729e138f608eca (patch) | |
| tree | b101dd575c5cab97675c0ac488e68fa6cbd0c4fd /app/controllers/admin_request_controller.rb | |
| parent | f02881b5bf5cc4d633983100078be2e64b8e6fcc (diff) | |
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 45a898759..56fd731fe 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -44,9 +44,9 @@ class AdminRequestController < AdminController # XXX is this *really* the only way to render a template to a # variable, rather than to the response? vars = OpenStruct.new(:name_to => @info_request.user_name, - :name_from => Configuration::contact_name, + :name_from => AlaveteliConfiguration::contact_name, :info_request => @info_request, :reason => params[:reason], - :info_request_url => 'http://' + Configuration::domain + request_url(@info_request), + :info_request_url => 'http://' + AlaveteliConfiguration::domain + request_url(@info_request), :site_name => site_name) template = File.read(File.join(File.dirname(__FILE__), "..", "views", "admin_request", "hidden_user_explanation.html.erb")) @request_hidden_user_explanation = ERB.new(template).result(vars.instance_eval { binding }) |