github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-15 04:26:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prevent moderators from seeing other users bookmarks

Browse Source
This commit is contained in:
João Fernandes
2016-03-20 18:27:28 +00:00
parent 67a5fc39de
commit ffeca8c2d4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user_action.rb
View File

@ -342,11 +342,11 @@ SQL
builder.where("COALESCE(p.post_type, p2.post_type) IN (:visible_post_types)", visible_post_types: visible_post_types) builder.where("COALESCE(p.post_type, p2.post_type) IN (:visible_post_types)", visible_post_types: visible_post_types)
unless (guardian.user && guardian.user.id == user_id) || guardian.is_staff? unless (guardian.user && guardian.user.id == user_id) || guardian.is_staff?
builder.where("a.action_type not in (#{BOOKMARK})")
builder.where("t.visible") builder.where("t.visible")
end end
unless guardian.can_see_notifications?(User.where(id: user_id).first) unless guardian.can_see_notifications?(User.where(id: user_id).first)
builder.where("a.action_type not in (#{BOOKMARK})")
builder.where('a.action_type <> :pending', pending: UserAction::PENDING) builder.where('a.action_type <> :pending', pending: UserAction::PENDING)
end end