From: Kai Krueger <kakrueger@gmail.com>
Date: Sun, 2 May 2010 10:03:45 +0000 (+0100)
Subject: Add an extra null pointer check that can trigger in tests
X-Git-Tag: live~6364^2~2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9faf30fb45234c84c1e9829c1842fa259cc61207

Add an extra null pointer check that can trigger in tests
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index cc12cc9e7..f02cd6dc1 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -49,7 +49,7 @@ class UserController < ApplicationController
         @user.openid_url = nil
 
         if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
-          if @user.pass_crypt.length == 0 
+          if (@user.pass_crypt.nil? or @user.pass_crypt.length == 0)
             #if the password is empty, but we have a openid 
             #then generate a random passowrd to disable 
             #loging in via password