Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle

lib/editor/atto/db/install.php

@@ -0,0 +1,50 @@
+<?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/>.
+
+/**
+ * Atto upgrade script.
+ *
+ * @package    editor_atto
+ * @copyright  2014 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Make the Atto the default editor for upgrades from 26.
+ *
+ * @return bool
+ */
+function xmldb_editor_atto_install() {
+    global $CFG;
+
+    // Make Atto the default.
+    $currenteditors = $CFG->texteditors;
+    $neweditors = array();
+
+    $list = explode(',', $currenteditors);
+    array_push($neweditors, 'atto');
+    foreach ($list as $editor) {
+        if ($editor != 'atto') {
+            array_push($neweditors, $editor);
+        }
+    }
+
+    set_config('texteditors', implode(',', $neweditors));
+
+    return true;
+}

lib/editor/atto/db/upgrade.php

@@ -0,0 +1,55 @@
+<?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/>.
+
+/**
+ * Atto upgrade script.
+ *
+ * @package    editor_atto
+ * @copyright  2014 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Run all Atto upgrade steps between the current DB version and the current version on disk.
+ * @param int $oldversion The old version of atto in the DB.
+ * @return bool
+ */
+function xmldb_editor_atto_upgrade($oldversion) {
+    global $CFG, $DB;
+
+    $dbman = $DB->get_manager();
+
+    if ($oldversion < 2014032800) {
+        // Make Atto the default.
+        $currenteditors = $CFG->texteditors;
+        $neweditors = array();
+
+        $list = explode(',', $currenteditors);
+        array_push($neweditors, 'atto');
+        foreach ($list as $editor) {
+            if ($editor != 'atto') {
+                array_push($neweditors, $editor);
+            }
+        }
+
+        set_config('texteditors', implode(',', $neweditors));
+        upgrade_plugin_savepoint(true, 2014032800, 'editor', 'atto');
+    }
+
+    return true;
+}

lib/editor/atto/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014012800;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2014032800;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2013110500;        // Requires this Moodle version.
 $plugin->component = 'editor_atto';  // Full name of the plugin (used for diagnostics).