Fix intended setting values are changed.

gjbarnard · Mar 7, 2021 · 562a1b1 · 562a1b1
1 parent de25c80
commit 562a1b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,9 @@
 Version Information
 ===================
+Version 3.10.1.1 - 07/03/2021
+-----------------------------
+  1. Fix intended setting values are changed.
+
 Version 3.10.1.0 - 04/03/2021
 -----------------------------
   1. Improve colour picker to show the initial value in the current / preview colour boxes.

diff --git a/lib.php b/lib.php
@@ -1006,7 +1006,7 @@ private function generate_default_entry($settingname, $defaultindex, $values) {
         $defaultvalue = get_config('format_topcoll', 'default'.$settingname);
         $defarray = array($defaultindex => new lang_string('default', 'format_topcoll', $values[$defaultvalue]));
 
-        return array_merge($defarray, $values);
+        return array_replace($defarray, $values);
     }
 
     /**

diff --git a/version.php b/version.php
@@ -33,8 +33,8 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2020110904;
+$plugin->version = 2020110905;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->requires  = 2020110900.00; // 3.10 (Build: 20201109).
 $plugin->component = 'format_topcoll';
-$plugin->release = '3.10.1.0';
+$plugin->release = '3.10.1.1';