Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index fd58145c47db8fcda56353fc0ff224361e9f9431..f2378f36d33caea9ec49fc34421ed3529637cb3f 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -14,7 +14,8 @@ class UserController < ApplicationController
     @user = User.new(params[:user])
 
     @user.data_public = true
-      
+    @user.description = "" if @user.description.nil?
+
     if @user.save
       token = @user.tokens.create
       flash[:notice] = "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br>Please note that you won't be able to login until you've received and confirmed your email address."