diff --git a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb index 21112a86a..d210cf186 100644 --- a/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb +++ b/app/views/maintenance/user/password_reset_mailer/confirmation.html.erb @@ -2,4 +2,4 @@
The password for the user "<%= @user.name %>" for the website <%= Danbooru.config.app_name %> has been reset. It is now <%= @new_password %>.
Please log in to the website and <%= link_to "change your password", edit_user_path(@user) %> as soon as possible.
+Please log in to the website and <%= link_to "change your password", edit_user_path(@user, :host => Danbooru.config.hostname, :only_path => false) %> as soon as possible.
diff --git a/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb b/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb index ad4235d30..796c609e3 100644 --- a/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb +++ b/app/views/maintenance/user/password_reset_mailer/reset_request.html.erb @@ -1,4 +1,4 @@Someone has requested that the password for "<%= @user.name %>" for the website <%= Danbooru.config.app_name %> be reset. If you did not request this, then you can ignore this email.
-To reset your password, please visit <%= link_to "this link", edit_maintenance_user_password_reset_path(:key => @nonce.key, :email => @nonce.email) %>.
+To reset your password, please visit <%= link_to "this link", edit_maintenance_user_password_reset_path(:host => Danbooru.config.hostname, :only_path => false, :key => @nonce.key, :email => @nonce.email) %>.
diff --git a/app/views/report_mailer/moderator_report.html.erb b/app/views/report_mailer/moderator_report.html.erb index ce5c38529..03c52c026 100644 --- a/app/views/report_mailer/moderator_report.html.erb +++ b/app/views/report_mailer/moderator_report.html.erb @@ -16,7 +16,7 @@ <% User.find(:all, :conditions => ["level >= ?", CONFIG["user_levels"]["Test Janitor"]], :order => "level, name").each do |user| %><%= link_to "View message", dmail_path(@dmail, :host => Danbooru.config.hostname, :only_path => false) %>
diff --git a/config/application.rb b/config/application.rb index 5fb50c9f0..655d64665 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,6 +19,5 @@ module Danbooru config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = {:enable_starttls_auto => false} config.action_mailer.perform_deliveries = true - config.action_mailer.default_url_options = {:host => Danbooru.config.hostname, :only_path => false} end end