Merge branch 'MDL-69010' of https://github.com/Chocolate-lightning/moodle

diff --cc admin/tool/moodlenet/db/upgrade.php
index 24f6beb,06dba45..955e4b0
--- 1/admin/tool/moodlenet/db/upgrade.php
--- 2/admin/tool/moodlenet/db/upgrade.php
+++ b/admin/tool/moodlenet/db/upgrade.php
@@@ -77,5 -77,23 +77,23 @@@ function xmldb_tool_moodlenet_upgrade(i
          upgrade_plugin_savepoint(true, 2020060500, 'tool', 'moodlenet');
      }
  
 -    if ($oldversion < 2020060500.01) {
++    if ($oldversion < 2020061501) {
+         // Change the domain.
+         $defaultmoodlenet = get_config('tool_moodlenet', 'defaultmoodlenet');
+ 
+         if ($defaultmoodlenet === 'https://home.moodle.net') {
+             set_config('defaultmoodlenet', 'https://moodle.net', 'tool_moodlenet');
+         }
+ 
+         // Change the name.
+         $defaultmoodlenetname = get_config('tool_moodlenet', 'defaultmoodlenetname');
+ 
+         if ($defaultmoodlenetname === 'Moodle HQ MoodleNet') {
+             set_config('defaultmoodlenetname', 'MoodleNet Central', 'tool_moodlenet');
+         }
+ 
 -        upgrade_plugin_savepoint(true, 2020060500.01, 'tool', 'moodlenet');
++        upgrade_plugin_savepoint(true, 2020061501, 'tool', 'moodlenet');
+     }
+ 
      return true;
  }

diff --cc admin/tool/moodlenet/lang/en/tool_moodlenet.php
index fbe02fa,52f6e17..11dc2d3
--- 1/admin/tool/moodlenet/lang/en/tool_moodlenet.php
--- 2/admin/tool/moodlenet/lang/en/tool_moodlenet.php
+++ b/admin/tool/moodlenet/lang/en/tool_moodlenet.php
@@@ -31,15 -31,17 +31,15 @@@ $string['aria:footermessage'] = "Brows
  $string['browsecontentmoodlenet'] = "Or browse for content on MoodleNet";
  $string['clearsearch'] = "Clear search";
  $string['connectandbrowse'] = "Connect to and browse:";
 -$string['defaultmoodlenet'] = "Default MoodleNet URL";
 +$string['defaultmoodlenet'] = 'MoodleNet URL';
  $string['defaultmoodlenet_desc'] = "The URL to either Moodle HQ's MoodleNet instance, or your preferred instance.";
  $string['defaultmoodlenetname'] = "MoodleNet instance name";
- $string['defaultmoodlenetnamevalue'] = 'MoodleNet Home';
+ $string['defaultmoodlenetnamevalue'] = 'MoodleNet Central';
 -$string['defaultmoodlenetname_desc'] = 'The name of either Moodle HQ\'s MoodleNet instance or your preferred MoodleNet instance to browse on.';
 +$string['defaultmoodlenetname_desc'] = 'The name of the MoodleNet instance available via the activity chooser.';
  $string['enablemoodlenet'] = 'Enable MoodleNet integration';
 -$string['enablemoodlenet_desc'] = 'Enabling the integration allows users with the capability to create and manage activities to
 -browse MoodleNet from the activity chooser and import MoodleNet resources into their course. It also allows users with the
 -capability to restore backups, to push backup files from MoodleNet into Moodle.';
 +$string['enablemoodlenet_desc'] = 'If enabled, a user with the capability to create and manage activities can browse MoodleNet via the activity chooser and import MoodleNet resources into their course. In addition, a user with the capability to restore backups can select a backup file on MoodleNet and restore it into Moodle.';
  $string['errorduringdownload'] = 'An error occurred while downloading the file: {$a}';
 -$string['forminfo'] = "It will be automatically saved on your moodle profile.";
 +$string['forminfo'] = 'Your MoodleNet profile will be automatically saved in your profile on this site.';
  $string['footermessage'] = "Or browse for content on";
  $string['instancedescription'] = "MoodleNet is an open social media platform for educators, with a focus on the collaborative curation of collections of open resources. ";
  $string['instanceplaceholder'] = '@yourprofile@moodle.net';

diff --cc admin/tool/moodlenet/version.php
index 1ba306e,b4115a2..4511523
--- 1/admin/tool/moodlenet/version.php
--- 2/admin/tool/moodlenet/version.php
+++ b/admin/tool/moodlenet/version.php
@@@ -25,6 -25,6 +25,6 @@@
  defined('MOODLE_INTERNAL') || die();
  
  $plugin->component  = 'tool_moodlenet';
- $plugin->version    = 2020061500;
 -$plugin->version    = 2020060500.01;
 -$plugin->requires   = 2020022800.01;
++$plugin->version    = 2020061501;
 +$plugin->requires   = 2020060900;
  $plugin->maturity   = MATURITY_ALPHA;