Tell users if the reason they can't login is because they haven't activated
[rails.git] / app / controllers / user_controller.rb
index f01157bc011fd3afa5ee9313faadef422172c7c0..998a636c1b11f6d1853d9b62771d901fe7ed78e8 100644 (file)
@@ -116,6 +116,8 @@ class UserController < ApplicationController
           redirect_to :controller => 'site', :action => 'index'
         end
         return
+      elsif User.authenticate(email, pass, false)
+        flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
       else
         flash[:notice] = "Sorry, couldn't log in with those details."
       end