jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dmail_notice.html.erb: use absolute urls in dtext links.

Browse Source
This commit is contained in:
evazion
2017-02-18 03:06:28 -06:00
parent d78c537ec2
commit 17d4feaf15
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/application_helper.rb
View File

@@ -49,9 +49,9 @@ module ApplicationHelper
raw %{<a href="#{h(url)}" #{attributes}>#{text}</a>} raw %{<a href="#{h(url)}" #{attributes}>#{text}</a>}
end end
def format_text(text, options = {}) def format_text(text, ragel: true, **options)
if options[:ragel] if ragel
raw(DTextRagel.parse(text)) raw DTextRagel.parse(text, **options)
else else
DText.parse(text) DText.parse(text)
end end

6
app/views/user_mailer/dmail_notice.html.erb
View File

@@ -1,10 +1,10 @@
<!doctype html> <!doctype html>
<html> <html>
<body> <body>
<p><%= h @dmail.from.name %> said:</p> <p><%= @dmail.from.name %> said:</p>
<div> <div class="prose">
<%= DText.parse(@dmail.body) %> <%= format_text(@dmail.body, base_url: root_url) %>
</div> </div>
<p><%= link_to "View message", dmail_url(@dmail, :host => Danbooru.config.hostname, :only_path => false) %> | <%= link_to "Unsubscribe", maintenance_user_email_notification_url(:user_id => @dmail.owner.id, :sig => email_sig(@dmail.owner), :host => Danbooru.config.hostname, :only_path => false) %></p> <p><%= link_to "View message", dmail_url(@dmail, :host => Danbooru.config.hostname, :only_path => false) %> | <%= link_to "Unsubscribe", maintenance_user_email_notification_url(:user_id => @dmail.owner.id, :sig => email_sig(@dmail.owner), :host => Danbooru.config.hostname, :only_path => false) %></p>