Fix for #1565. Added a couple of tests and fixed another issue with re-used placehold...

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 825c9263582c8f66076cb891c495ef39610f3e3c..7ebe6b6b6f7af8ddcbe3404b3f2b99f64a38b45f 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -124,6 +124,7 @@ class UserController < ApplicationController
       else
         redirect_to :controller => 'site', :action => 'index'
       end
+      return
     end
     @title = 'login'
     if params[:user]