Merge remote-tracking branch 'upstream/pull/5726'

[rails.git] / app / controllers / concerns / user_methods.rb

diff --git a/app/controllers/concerns/user_methods.rb b/app/controllers/concerns/user_methods.rb
index 28305b5c3d55e2beed6c77cefbe6639532f42f2f..447aea3fce3013ac2734992c4c8648ad612ce339 100644 (file)
--- a/app/controllers/concerns/user_methods.rb
+++ b/app/controllers/concerns/user_methods.rb
@@ -6,9 +6,10 @@ module UserMethods
   ##
   # ensure that there is a "user" instance variable
   def lookup_user
   ##
   # ensure that there is a "user" instance variable
   def lookup_user

-    @user = User.active.find_by!(:display_name => params[:display_name])
+    display_name = params[:display_name] || params[:user_display_name]
+    @user = User.active.find_by!(:display_name => display_name)

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    render_unknown_user params[:display_name]
+    render_unknown_user display_name

   end
 
   ##
   end
 
   ##


@@ -58,8 +59,9 @@ module UserMethods
             # Ignore errors sending email
           end
         else
             # Ignore errors sending email
           end
         else

-          current_user.errors.add(:new_email, current_user.errors[:email])
-          current_user.errors.add(:email, [])
+          current_user.errors.delete(:email).each do |error|
+            current_user.errors.add(:new_email, error)
+          end

         end
 
         user.restore_email!
         end
 
         user.restore_email!