MDL-19969 standarising plugin names - prevent dupes in case record is already there

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 2976fd8aeae9cb15e59a732ef0b6acc25b574b51..b7a4c5b544a5830d3512426dc3325a2c1ad2f72d 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2208,8 +2208,9 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         // standardizing plugin names
         if ($configs = $DB->get_records_select('config_plugins', "plugin LIKE 'quizreport_%'")) {
             foreach ($configs as $config) {
+                $result = $result && unset_config($config->name, $config->plugin); /// unset old config
                 $config->plugin = str_replace('quizreport_', 'quiz_', $config->plugin);
-                $DB->update_record('config_plugins', $config);
+                $result = $result && set_config($config->name, $config->value, $config->plugin); /// set new config
             }
         }
         unset($configs);
@@ -2220,8 +2221,9 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         // standardizing plugin names
         if ($configs = $DB->get_records_select('config_plugins', "plugin LIKE 'assignment_type_%'")) {
             foreach ($configs as $config) {
+                $result = $result && unset_config($config->name, $config->plugin); /// unset old config
                 $config->plugin = str_replace('assignment_type_', 'assignment_', $config->plugin);
-                $DB->update_record('config_plugins', $config);
+                $result = $result && set_config($config->name, $config->value, $config->plugin); /// set new config
             }
         }
         unset($configs);