Merge branch 'MDL-64823_master' of https://github.com/marxjohnson/moodle

diff --git a/admin/tool/mobile/classes/api.php b/admin/tool/mobile/classes/api.php
index 71cf2bb..bd49699 100644 (file)
--- a/admin/tool/mobile/classes/api.php
+++ b/admin/tool/mobile/classes/api.php
@@ -356,7 +356,7 @@ class api {
         $mobileplugins = self::get_plugins_supporting_mobile();
         foreach ($mobileplugins as $plugin) {
             $displayname = core_plugin_manager::instance()->plugin_name($plugin['component']) . " - " . $plugin['addon'];
-            $remoteaddonslist['remoteAddOn_' . $plugin['component'] . '_' . $plugin['addon']] = $displayname;
+            $remoteaddonslist['sitePlugin_' . $plugin['component'] . '_' . $plugin['addon']] = $displayname;
 
         }
 

diff --git a/admin/tool/mobile/db/upgrade.php b/admin/tool/mobile/db/upgrade.php
new file mode 100644 (file)
index 0000000..73748aa
--- /dev/null
+++ b/admin/tool/mobile/db/upgrade.php
@@ -0,0 +1,46 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Mobile app support.
+ *
+ * @package    tool_mobile
+ * @copyright  2019 The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/lib/upgradelib.php');
+
+/**
+ * Upgrade the plugin.
+ *
+ * @param int $oldversion
+ * @return bool always true
+ */
+function xmldb_tool_mobile_upgrade($oldversion) {
+    global $CFG;
+
+    if ($oldversion < 2019021100) {
+        $disabledfeatures = get_config('tool_mobile', 'disabledfeatures');
+        $disabledfeatures = str_replace('remoteAddOn_', 'sitePlugin_', $disabledfeatures);
+        set_config('disabledfeatures', $disabledfeatures, 'tool_mobile');
+        upgrade_plugin_savepoint(true, 2019021100, 'tool', 'mobile');
+    }
+
+    return true;
+}

diff --git a/admin/tool/mobile/version.php b/admin/tool/mobile/version.php
index 4584e2d..bc7dc20 100644 (file)
--- a/admin/tool/mobile/version.php
+++ b/admin/tool/mobile/version.php
@@ -23,7 +23,7 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2018120300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2019021100; // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2018112800; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(