Merge remote branch 'remotes/apmon/openID' into openID

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index f9755204a27b4c0dfb6d64484d9cb41d4e2b5571..00dbcafb6ac44d5ba6211ca38c6467077fdd1d5f 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -133,6 +133,8 @@ class UserController < ApplicationController
       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
+      @user.openid_url = nil if (params[:user][:openid_url].length == 0)
+
       if @user.save
         set_locale