Commit f12688f3 authored by Donal McMullan's avatar Donal McMullan
Browse files

Revise signature of get_config_plugin_instance function - pluginname is not

required
parent b0091341
...@@ -574,22 +574,22 @@ function set_config_plugin($plugintype, $pluginname, $key, $value) { ...@@ -574,22 +574,22 @@ function set_config_plugin($plugintype, $pluginname, $key, $value) {
* @param string $pluginid Instance id * @param string $pluginid Instance id
* @param string $key The config setting to look for * @param string $key The config setting to look for
*/ */
function get_config_plugin_instance($plugintype, $pluginname, $pluginid, $key) { function get_config_plugin_instance($plugintype, $pluginid, $key) {
global $CFG; global $CFG;
// Must be unlikely to exist as a config option for any plugin // Must be unlikely to exist as a config option for any plugin
$instance = '_i_n_s_t'.$pluginid; $instance = '_i_n_s_t'.$pluginid;
// Suppress NOTICE with @ in case $key is not yet cached // Suppress NOTICE with @ in case $key is not yet cached
@$value = $CFG->plugin->{$plugintype}->{$pluginname}->{$instance}->{$key}; @$value = $CFG->plugin->{$plugintype}->{$instance}->{$key};
if(isset($value)) { if(isset($value)) {
return $value; return $value;
} }
$records = get_records_array($plugintype . '_instance_config', 'instance', $pluginid, $pluginid, 'field, value'); $records = get_records_array($plugintype . '_instance_config', 'instance', $pluginid, 'field', 'field, value');
if(!empty($records)) { if(!empty($records)) {
foreach($records as $record) { foreach($records as $record) {
$CFG->plugin->{$plugintype}->{$pluginname}->{$instance}->{$record->field} = $record->value; $CFG->plugin->{$plugintype}->{$instance}->{$record->field} = $record->value;
if($record->field == $key) { if($record->field == $key) {
$value = $record->value; $value = $record->value;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment