From 10af2b14d149289339456c3b60860210f18887e1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 28 Dec 2016 16:44:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=82=AE=E4=BB=B6=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb               | 1 +
 app/views/mailer/register.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 905cac944..a03c35381 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -848,6 +848,7 @@ class Mailer < ActionMailer::Base
   def register(token)
     set_language_if_valid(token.user.language)
     @token = token
+    @login = token.user.try(:login)
     @url = url_for(:controller => 'account', :action => 'activate', :token => token.value)
     mail :to => token.user.mail,
          :subject => "#{Setting.mail_subject}"
diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
index 40b8c4d29..146456358 100644
--- a/app/views/mailer/register.html.erb
+++ b/app/views/mailer/register.html.erb
@@ -23,13 +23,13 @@
 <div class="new_content">
   <div style="width: 598px; background:#fff; margin:20px auto;">
     <div style="height:50px; width: 578px; background:#3b94d6; padding:9px 10px 6px;border:1px solid #ddd; border-bottom:none;">
-      <a href="www.trustie.net" ><img src="http://www.trustie.net/images/nav_logo.png" width="51" height="45" ></a>
+      <a href="https://www.trustie.net/"><img src="http://www.trustie.net/images/nav_logo.png" width="51" height="45" ></a>
       <p style="color:#fff; float:right; margin-top:15px;">确实让创新更美好</p>
       <div style="clear:both; overflow:hidden;"></div>
     </div>
     <div style="width: 558px; border-left:1px solid #ddd;border-right:1px solid #ddd; background:#fff; padding:20px; color:#333; line-height: 1.9;">
       <p style="font-size: 14px; color:#333;">
-        <span style="font-weight:bold;color:#3b94d6;"><%= @user.show_name %></span>,您好！<br/>
+        <span style="font-weight:bold;color:#3b94d6;"><%= @login %></span>,您好！<br/>
         您已经成功注册为Trustie用户！<br/>
         请点击以下链接激活您的帐号：<br/>
         <%= link_to h(@url), @url, :style => "font-weight: normal; color:#3b94d6;" %><br/>