Merge pull request #812 from dannon/prt_email_tweak

Tweak password reset email template to truly be plain text.

lib/galaxy/webapps/galaxy/controllers/user.py

@@ -48,7 +48,7 @@ PASSWORD_RESET_TEMPLATE = """
 To reset your Galaxy password for the instance at %s use the following link,
 which will expire %s.
 
-<a href="%s">%s</a>
+%s
 
 If you did not make this request, no action is necessary on your part, though
 you may want to notify an administrator.
@@ -1199,7 +1199,7 @@ class User( BaseUIController, UsesFormDefinitionsMixin, CreatesUsersMixin, Creat
                                          action="change_password",
                                          token=prt.token, qualified=True)
                     body = PASSWORD_RESET_TEMPLATE % ( host, prt.expiration_time.strftime(trans.app.config.pretty_datetime_format),
-                                                       reset_url, reset_url )
+                                                       reset_url )
                     frm = trans.app.config.email_from or 'galaxy-no-reply@' + host
                     subject = 'Galaxy Password Reset'
                     try: