Merge branch 'MDL-27848_for_MOODLE_20_STABLE' of git://github.com/kor…

…dan/moodle into MOODLE_20_STABLE

theme/formal_white/db/upgrade.php

@@ -0,0 +1,64 @@
+<?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/>.
+
+/**
+ * formal_white module upgrade code
+ *
+ * This file keeps track of upgrades to
+ * the theme plugin
+ *
+ * Sometimes, changes between versions involve
+ * alterations to database structures and other
+ * major things that may lose the effort they've put
+ * into customising and setting up your theme.
+ *
+ * The upgrade function in this file will attempt
+ * to perform all the necessary actions to upgrade
+ * your older installation to the current version.
+ *
+ * If there's something it cannot do itself, it
+ * will tell you what you need to do.
+ *
+ * The commands in here will all be database-neutral,
+ * using the methods of database_manager class
+ *
+ * Please do not forget to use upgrade_set_timeout()
+ * before any action that may take longer time to finish.
+ *
+ * @package    theme
+ * @subpackage formal_white
+ * @copyright  Mediatouch 2000 (http://mediatouch.it/)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+function xmldb_theme_formal_white_upgrade($oldversion) {
+    if ($oldversion < 2011061301) {
+        $currentsetting = get_config('theme_formal_white');
+
+        if (isset($currentsetting->backgroundcolor)) {
+            unset_config('backgroundcolor', 'theme_formal_white');
+        }
+        if (isset($currentsetting->blockcolumnbgc)) {
+            unset_config('blockcolumnbgc', 'theme_formal_white');
+        }
+        upgrade_plugin_savepoint(true, 2011061301, 'theme', 'formal_white');
+    }
+
+    return true;
+}

theme/formal_white/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version  = 2011052000;  // The current module version (Date: YYYYMMDDXX)
+$plugin->version  = 2011061301;  // The current module version (Date: YYYYMMDDXX)
 $plugin->component = 'theme_formal_white';
 $plugin->requires = 2010080300;  // Requires this Moodle version
 $plugin->maturity  = MATURITY_STABLE;