cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into openstreetbugs

Browse source
This commit is contained in:
Tom Hughes 2010-05-09 17:16:32 +01:00
commit 0caaf54de5
6 changed files with 90 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/user_controller.rb
View file

@ -129,7 +129,7 @@ class UserController < ApplicationController
if params[:user]
@user.pass_crypt = params[:user][:pass_crypt]
@user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
@user.status = "active"
@user.status = "active" if @user.status == "pending"
@user.email_valid = true
if @user.save