github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 17:26:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: site_contact_user should default to system user, not first admin user

Browse Source
This commit is contained in:
Neil Lalonde
2015-11-24 14:37:33 -05:00
parent d65ec1af2e
commit f4d44187c8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/discourse.rb
View File

@ -272,7 +272,7 @@ module Discourse
# Either returns the site_contact_username user or the first admin.
def self.site_contact_user
user = User.find_by(username_lower: SiteSetting.site_contact_username.downcase) if SiteSetting.site_contact_username.present?
user ||= User.admins.real.order(:id).first
user ||= (system_user || User.admins.real.order(:id).first)
end
SYSTEM_USER_ID ||= -1