1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index da01e09c8..bae05ce1b 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -33,7 +33,7 @@ class ApplicationController < ActionController::Base
   
   # check if login is globally required to access the application
   def check_if_login_required
-    require_login if $RDM_LOGIN_REQUIRED
+    require_login if Setting.login_required?
   end 
   
   def set_localization
@@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
       end
     rescue
       nil
-    end || $RDM_DEFAULT_LANG
+    end || Setting.default_language
     set_language_if_valid(lang)    
   end