diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2012-09-25 08:55:35 +1000 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2012-09-25 08:55:35 +1000 |
| commit | f59700138f7360436767fddea554c739e2cd484b (patch) | |
| tree | 8c3af52f3f1f369ab412fa7571f19860e4f260b8 /app/controllers/user_controller.rb | |
| parent | 265e336ae0608af39aa3aad8b27862e572222562 (diff) | |
Extract configuration with defaults into one module
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 0a9e1d781..c48f75204 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -138,7 +138,7 @@ class UserController < ApplicationController # Login form def signin work_out_post_redirect - @request_from_foreign_country = country_from_ip != MySociety::Config.get('ISO_COUNTRY_CODE', 'GB') + @request_from_foreign_country = country_from_ip != Configuration::iso_country_code # make sure we have cookies if session.instance_variable_get(:@dbman) if not session.instance_variable_get(:@dbman).instance_variable_get(:@original) @@ -192,7 +192,7 @@ class UserController < ApplicationController # Create new account form def signup work_out_post_redirect - @request_from_foreign_country = country_from_ip != MySociety::Config.get('ISO_COUNTRY_CODE', 'GB') + @request_from_foreign_country = country_from_ip != Configuration::iso_country_code # Make the user and try to save it @user_signup = User.new(params[:user_signup]) error = false |