Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1678 from eriko/patch-3 

Load plugin settings.
This commit is contained in:
Neil Lalonde 2013-11-20 07:54:20 -08:00
parent 31fd5b85bc bf390163aa
commit 9de07fd83f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/site_setting.rb
View File

@ -7,13 +7,22 @@ class SiteSetting < ActiveRecord::Base
validates_presence_of :name
validates_presence_of :data_type
SiteSettings::YamlLoader.new( File.join( Rails.root, 'config', 'site_settings.yml') ).load do |category, name, default, opts|
def self.load_settings(file)
SiteSettings::YamlLoader.new(file).load do |category, name, default, opts|
if opts.delete(:client)
client_setting(name, default, opts.merge(category: category))
else
setting(name, default, opts.merge(category: category))
end
end
end
load_settings(File.join(Rails.root, 'config', 'site_settings.yml'))
Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
load_settings(file)
end
def self.call_discourse_hub?
self.enforce_global_nicknames? && self.discourse_org_access_key.present?