merge.html.erb in spree_social-1.1

- old
+ new

@@ -1,10 +1,10 @@
 <% @body_id = 'login' %>
 <div id="existing-customer">
   <h2><%= t("login_as_existing") %></h2>
   <%= form_for(:user, :url => merge_user_path) do |f| %>
-    <%= hidden_field_tag(:user_authentication, current_user.user_authentications.first.id) %>
+    <%= hidden_field_tag(:user_authentication, @user.user_authentications.first.id) %>
     <%= f.hidden_field(:id) %>
     <div id='password-credentials'>
       <p>
         <%= f.label(:email, t("email")) %><br />
         <%= f.text_field('email', :class => 'title') %>
@@ -15,6 +15,6 @@
       </p>
     </div>
   <p><%= submit_tag t("log_in"), :class => 'button primary'%></p>
   <%= link_to t("forgot_password"), new_user_password_path %>
   <% end %>
-</div>
\ No newline at end of file
+</div>