이응준 2015-01-08
Merge branch 'fix/at-character-in-email-address' of dlab/hive
from pull-request 1418

* refs/heads/fix/at-character-in-email-address:
  user: Fix a bug that cannot send password-reset email

Reviewed-by: 백기선 
@8a14de4657dd8cd1a17d2e344cfbd4059ee5823c
app/controllers/PasswordResetApp.java
--- app/controllers/PasswordResetApp.java
+++ app/controllers/PasswordResetApp.java
@@ -32,6 +32,7 @@
 import play.i18n.Messages;
 import play.mvc.Controller;
 import play.mvc.Result;
+import utils.Config;
 import utils.Constants;
 import utils.PasswordReset;
 import views.html.site.lostPassword;
@@ -71,8 +72,7 @@
     }
 
     private static boolean sendPasswordResetMail(User user, String hashString) {
-        Configuration config = play.Play.application().configuration();
-        String sender = config.getString("smtp.user") + "@" + config.getString("smtp.domain");
+        String sender = Config.getEmailFromSmtp();
         String resetPasswordUrl = getResetPasswordUrl(hashString);
 
         try {
Add a comment
List