MDL-22515 plugin settings can be forced now too + minor CFG init refactoring + get_config() cleanup
This commit is contained in:
+8
-3
@@ -5718,10 +5718,15 @@ function format_admin_setting($setting, $title='', $form='', $description='', $l
|
||||
$labelfor = '';
|
||||
}
|
||||
|
||||
if (empty($setting->plugin) and array_key_exists($setting->name, $CFG->config_php_settings)) {
|
||||
$override = '<div class="form-overridden">'.get_string('configoverride', 'admin').'</div>';
|
||||
$override = '';
|
||||
if (empty($setting->plugin)) {
|
||||
if (array_key_exists($setting->name, $CFG->config_php_settings)) {
|
||||
$override = '<div class="form-overridden">'.get_string('configoverride', 'admin').'</div>';
|
||||
}
|
||||
} else {
|
||||
$override = '';
|
||||
if (array_key_exists($setting->plugin, $CFG->forced_plugin_settings) and array_key_exists($setting->name, $CFG->forced_plugin_settings[$setting->plugin])) {
|
||||
$override = '<div class="form-overridden">'.get_string('configoverride', 'admin').'</div>';
|
||||
}
|
||||
}
|
||||
|
||||
if ($warning !== '') {
|
||||
|
||||
Reference in New Issue
Block a user