Merge from head

[selectricity] / app / controllers / account_controller.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index e8adcf0fe809b8a466f38eb7161e5af765060104..c9388f6f52c542fc7e6081556ccdb5ae661282a8 100644 (file)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -14,6 +14,7 @@ class AccountController < ApplicationController
   #these methods provide basic functionality for the user login system
   #===================================================================
   def login
+    
     return unless request.post?
     self.current_user = User.authenticate(params[:login], params[:password])
     if logged_in?
@@ -25,6 +26,10 @@ class AccountController < ApplicationController
       flash[:notice] = "Logged in successfully"
     end
   end
+  
+  def forgot_password
+    raise "Not Implemented!"
+  end
 
   def signup
     @user = User.new(params[:user])