Permalink
Browse files

Merge branch 'production' of github.com:penCENTRIC/clahrc into produc…

…tion
  • Loading branch information...
accuser committed Mar 5, 2011
2 parents 1d8ceb2 + f76ebcb commit 237393426712f8b35fc99137bab9dbb2f1600064
Showing with 2 additions and 5 deletions.
  1. +1 −4 app/models/comment_activity.rb
  2. +1 −1 app/models/received_message_activity.rb
@@ -27,10 +27,7 @@ def commentable_comments_url(commentable, options = {})
def prepare_notifications
if comment.commentable.respond_to?(:follows)
notification = { :event => 'reply to followed thread', :status => 'posted', :activity => self }
- comment.commentable.follows.each { |user| user.process_notification(notification) }
+ comment.commentable.follows.each { |u| u.process_notification(notification) }
end
-
- notification = { :event => 'new content in group', :status => 'posted', :activity => self }
- comment.group.members.each { |user| user.process_notification(notification, group) unless user == comment.user }
end
end
@@ -19,6 +19,6 @@ def describe
def prepare_notifications
notification = { :event => 'private message', :status => 'posted', :activity => self }
- received_message.recipients.each { |user| user.process_notification(notification) }
+ received_message.user.process_notification(notification)
end
end

0 comments on commit 2373934

Please sign in to comment.