Make passwords with a colon in them work.

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 998a636c1b11f6d1853d9b62771d901fe7ed78e8..9972ca3ee6c203dd0d6ea2ac0ca348aef82c611e 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -165,7 +165,7 @@ class UserController < ApplicationController
       @user.save!
       render :nothing => true
     else
       @user.save!
       render :nothing => true
     else

-      render :status => 400, :nothing => true
+      render :nothing => true, :status => :method_not_allowed

     end
   end
 
     end
   end
 


@@ -186,11 +186,6 @@ class UserController < ApplicationController
     @title = @this_user.display_name
   end
 
     @title = @this_user.display_name
   end
 

-  def diary
-    @this_user = User.find_by_display_name(params[:display_name])
-    @title = @this_user.display_name + "'s diary"
-  end
-

   def make_friend
 
     if params[:display_name]     
   def make_friend
 
     if params[:display_name]