Merge branch 'MDL-61973-master' of git://github.com/mickhawkins/moodle

diff --cc lib/editor/atto/db/upgrade.php
index 662d604,9ca2acd..c663679
--- 1/lib/editor/atto/db/upgrade.php
--- 2/lib/editor/atto/db/upgrade.php
+++ b/lib/editor/atto/db/upgrade.php
@@@ -66,5 -66,36 +66,36 @@@ function xmldb_editor_atto_upgrade($old
          upgrade_plugin_savepoint(true, 2018041100, 'editor', 'atto');
      }
  
 -    if ($oldversion < 2018050400) {
++    if ($oldversion < 2018051401) {
+         $toolbar = get_config('editor_atto', 'toolbar');
+         $glue = "\r\n";
+         $iconorderold = 'image, media, managefiles, recordrtc';
+         $iconordernew = 'image, media, recordrtc, managefiles';
+ 
+         if (strpos($toolbar, $glue) === false) {
+             $glue = "\n";
+         }
+ 
+         $groups = explode($glue, $toolbar);
+ 
+         // Reorder atto media icons if in default configuration.
+         foreach ($groups as $i => $group) {
+             $parts = explode('=', $group);
+ 
+             if (trim($parts[0]) == 'files') {
+                 if (trim(preg_replace('/,\s*/', ', ', $parts[1])) == $iconorderold) {
+                     $groups[$i] = 'files = ' . $iconordernew;
+ 
+                     // Update config variable.
+                     $toolbar = implode($glue, $groups);
+                     set_config('toolbar', $toolbar, 'editor_atto');
+                 }
+             }
+         }
+ 
+         // Atto editor savepoint reached.
 -        upgrade_plugin_savepoint(true, 2018050400, 'editor', 'atto');
++        upgrade_plugin_savepoint(true, 2018051401, 'editor', 'atto');
+     }
+ 
      return true;
  }

diff --cc lib/editor/atto/version.php
index 21aff02,e91098f..2172999
--- 1/lib/editor/atto/version.php
--- 2/lib/editor/atto/version.php
+++ b/lib/editor/atto/version.php
@@@ -24,6 -24,6 +24,6 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2018051400;        // The current plugin version (Date: YYYYMMDDXX).
 -$plugin->version   = 2018050400;        // The current plugin version (Date: YYYYMMDDXX).
 -$plugin->requires  = 2017110800;        // Requires this Moodle version.
++$plugin->version   = 2018051401;        // The current plugin version (Date: YYYYMMDDXX).
 +$plugin->requires  = 2018050800;        // Requires this Moodle version.
  $plugin->component = 'editor_atto';  // Full name of the plugin (used for diagnostics).