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

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

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 2e223393993b1c5fc648ea9f1e0da95afe1b2fb7..3c2084a5b82ee4cd39223d4a623abe4b4d82c715 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -20,11 +20,11 @@ class SessionsController < ApplicationController
   def create
     session[:remember_me] ||= params[:remember_me]
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
   def create
     session[:remember_me] ||= params[:remember_me]
     session[:referer] = safe_referer(params[:referer]) if params[:referer]

-    password_authentication(params[:username], params[:password])
+    password_authentication(params[:username].strip, params[:password])

   end
 
   def destroy
   end
 
   def destroy

-    @title = t "sessions.destroy.title"
+    @title = t ".title"

 
     if request.post?
       if session[:token]
 
     if request.post?
       if session[:token]