From 17f926fefb1329aaa41a64634d17d1dffd3ddba5 Mon Sep 17 00:00:00 2001
From: Thijs Alkemade <thijsalkemade@gmail.com>
Date: Sun, 1 Feb 2015 10:33:01 +0000
Subject: [PATCH] Fix two issues with the remember_me_openid button

1. It didn't work, the code only checked the remember_me button, not
   the remember_me_openid button.

2. It did not have a unique id, making the label next to it not work
   for selecting the checkbox.
---
 app/controllers/user_controller.rb | 3 ++-
 app/views/user/login.html.erb      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a7bf53824..ea50113e5 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -276,12 +276,13 @@ class UserController < ApplicationController
 
   def login
     if params[:username] or using_open_id?
-      session[:remember_me] ||= params[:remember_me]
       session[:referer] ||= params[:referer]
 
       if using_open_id?
+        session[:remember_me] ||= params[:remember_me_openid]
         openid_authentication(params[:openid_url])
       else
+        session[:remember_me] ||= params[:remember_me]
         password_authentication(params[:username], params[:password])
       end
     end
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 051d270a4..a78916dcc 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -54,7 +54,7 @@
             <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
           </div>
 
-          <div id="remember_me_openid" class='form-row'>
+          <div class='form-row'>
             <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
             <label class="standard-label" for="remember_me_openid"><%= t 'user.login.remember' %></label>
           </div>
-- 
2.43.2