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

Rename "Blocked" to "Silenced"

Browse Source
This commit is contained in:
Robin Ward
2017-11-10 12:18:08 -05:00
parent ec3d800492
commit 1f14350220
51 changed files with 366 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/badge_queries.rb
View File

@ -141,10 +141,10 @@ SQL
SELECT invited_by_id
FROM invites i
JOIN users u2 ON u2.id = i.user_id
WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND not u2.blocked
WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND not u2.silenced
GROUP BY invited_by_id
HAVING COUNT(*) >= #{count.to_i}
) AND u.active AND NOT u.blocked AND u.id > 0 AND
) AND u.active AND NOT u.silenced AND u.id > 0 AND
(:backfill OR u.id IN (:user_ids) )
"
end