codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3195 from techAPJ/patch-1

Browse source 
FIX: set base_url for usage_tips
This commit is contained in:
Robin Ward 2015-02-10 12:53:33 -05:00
commit 9b12e53d9c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/user_notifications.rb
View file

@ -18,7 +18,7 @@ class UserNotifications < ActionMailer::Base
build_email(user.email,
template: 'user_notifications.signup_after_approval',
email_token: opts[:email_token],
new_user_tips: SiteText.text_for(:usage_tips))
new_user_tips: SiteText.text_for(:usage_tips, base_url: Discourse.base_url))
end
def authorize_email(user, opts={})

2
lib/system_message.rb
View file

@ -50,7 +50,7 @@ class SystemMessage
site_name: SiteSetting.title,
username: @recipient.username,
user_preferences_url: "#{Discourse.base_url}/users/#{@recipient.username_lower}/preferences",
new_user_tips: SiteText.text_for(:usage_tips),
new_user_tips: SiteText.text_for(:usage_tips, base_url: Discourse.base_url),
site_password: "",
base_url: Discourse.base_url,
}