settings are now stored in the database (config_custom.rb no more used) and editable through the application in: Admin -> Settings

git-svn-id: http://redmine.rubyforge.org/svn/trunk@167 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index fb775d196..c3b0ebd7f 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.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

@@ -95,7 +95,7 @@ class AccountController < ApplicationController
   

   # User self-registration

   def register

-    redirect_to :controller => '' and return if $RDM_SELF_REGISTRATION == false

+    redirect_to :controller => '' and return unless Setting.self_registration?

     if params[:token]

       token = Token.find_by_action_and_value("register", params[:token])

       redirect_to :controller => '' and return unless token and !token.expired?

@@ -110,7 +110,7 @@ class AccountController < ApplicationController
       end      

     else

       if request.get?

-        @user = User.new(:language => $RDM_DEFAULT_LANG)

+        @user = User.new(:language => Setting.default_language)

         @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }

       else

         @user = User.new(params[:user])