From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Thu, 5 Sep 2019 00:48:00 +0000 (+0200)
Subject: Merge branch 'MDL-66072-master-3' of git://github.com/peterRd/moodle
X-Git-Tag: v3.8.0-beta~367
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=9533156775bcc16c5695f3279b4cdd2edf2c3c64

Merge branch 'MDL-66072-master-3' of git://github.com/peterRd/moodle
---

9533156775bcc16c5695f3279b4cdd2edf2c3c64
diff --cc lang/en/hub.php
index 65d24bc437a,d10a47da332..ebe023fa27b
--- a/lang/en/hub.php
+++ b/lang/en/hub.php
@@@ -155,16 -109,12 +109,12 @@@ $string['sendingsize'] = 'Please wait t
  $string['sendfollowinginfo'] = 'More information';
  $string['sendfollowinginfo_help'] = 'The following information will be sent to contribute to overall statistics only.  It will not be made public on any site listing.';
  $string['sent'] = '...finished';
- $string['share'] = 'Share this course for people to download';
- $string['shared'] = 'For people to download';
- $string['shareon'] = 'Upload this course to {$a}';
- $string['sharepublication_help'] = 'A backup of this course will be available on Moodle.net for people to restore and use on their own site.';
  $string['siteadmin'] = 'Administrator';
  $string['siteadmin_help'] = 'The full name of the site administrator.';
 -$string['sitecommnews'] = 'Updates about Moodle news and features';
 -$string['sitecommnews_help'] = 'You have the option of subscribing to our low volume email list including a newsletter about happenings in the Moodle community. ';
 -$string['sitecommnewsno'] = 'No, I do not want to receive any email from Moodle HQ';
 -$string['sitecommnewsyes'] = 'Yes please, include me in Moodle’s regular e-newsletter updates';
 +$string['sitecommnews'] = 'Moodle newsletter';
 +$string['sitecommnews_help'] = 'You have the option of subscribing to our Moodle newsletter. You may unsubscribe at any time.';
 +$string['sitecommnewsno'] = 'No, I do not wish to receive any emails';
 +$string['sitecommnewsyes'] = 'Yes, I would like to receive the Moodle newsletter';
  $string['sitecountry'] = 'Country';
  $string['sitecountry_help'] = 'The country your organisation or institution is located in.';
  $string['sitedesc'] = 'Description';
diff --cc lib/db/upgrade.php
index d0e61c4eec8,c5307882322..abb41280056
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -3510,8 -3510,14 +3510,14 @@@ function xmldb_main_upgrade($oldversion
              $DB->delete_records_list('capabilities', 'name', $capabilitiestoberemoved);
          }
  
 -        upgrade_main_savepoint(true, 2019082400.01);
 +        upgrade_main_savepoint(true, 2019083000.01);
      }
  
+     if ($oldversion < 2019083000.02) {
+         // Remove unused config.
+         unset_config('enablecoursepublishing');
+         upgrade_main_savepoint(true, 2019083000.02);
+     }
+ 
      return true;
  }