IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "DEV: Add configurable? helper to Plugin::Instance (#20767)" (#21469)

Browse Source 
This reverts commit 3073e5cfb0.
This commit is contained in:
Joffrey JAFFEUX
2023-05-10 12:41:55 +02:00
committed by GitHub
parent 3073e5cfb0
commit 3727c95f6f
7 changed files with 16 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/admin/site_settings_controller.rb
View File

@@ -259,18 +259,10 @@ class Admin::SiteSettingsController < Admin::AdminController
end
def raise_access_hidden_setting(id)
id = id.to_sym
if SiteSetting.hidden_settings.include?(id)
# note, as of Ruby 2.3 symbols are GC'd so this is considered safe
if SiteSetting.hidden_settings.include?(id.to_sym)
raise Discourse::InvalidParameters, "You are not allowed to change hidden settings"
end
if SiteSetting.plugins[id]
plugin = Discourse.plugins_by_name[SiteSetting.plugins[id]]
if !plugin.configurable?
raise Discourse::InvalidParameters, "You are not allowed to change unconfigurable settings"
end
end
end
def tag_notification_level(id)

6
app/controllers/application_controller.rb
View File

@@ -346,11 +346,7 @@ class ApplicationController < ActionController::Base
# disabled. This allows plugins to be disabled programmatically.
def self.requires_plugin(plugin_name)
before_action do
if plugin = Discourse.plugins_by_name[plugin_name]
raise PluginDisabled.new if !plugin.enabled?
else
Rails.logger.warn("Required plugin '#{plugin_name}' not found")
end
raise PluginDisabled.new if Discourse.disabled_plugin_names.include?(plugin_name)
end
end