cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge -r 20198:20540 from trunc into openstreetbugs branch

Browse source
This commit is contained in:
Kai Krueger 2010-03-18 12:42:23 +00:00
commit 03f733c4f4
104 changed files with 2036 additions and 1142 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/notifier.rb
View file

@ -89,15 +89,9 @@ class Notifier < ActionMailer::Base
end
def friend_notification(friend)
befriender = User.find_by_id(friend.user_id)
befriendee = User.find_by_id(friend.friend_user_id)
common_headers befriendee
subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale)
body :user => befriender.display_name,
:userurl => url_for(:host => SERVER_URL,
:controller => "user", :action => "view",
:display_name => befriender.display_name)
common_headers friend.befriendee
subject I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => locale)
body :friend => friend
end
private