Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 03:10:18 +0000 (11:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 03:10:18 +0000 (11:10 +0800)
Conflicts:
enrol/self/db/upgrade.php

1  2 
enrol/self/db/upgrade.php

@@@ -55,7 -55,12 +55,13 @@@ function xmldb_enrol_self_upgrade($oldv
  
      // Moodle v2.6.0 release upgrade line.
      // Put any upgrade step following this.
 +
+     if ($oldversion < 2013112100) {
+         // Set customint1 (group enrolment key) to 0 if it was not set (null).
+         $DB->execute("UPDATE {enrol} SET customint1 = 0 WHERE enrol = 'self' AND customint1 IS NULL");
+         upgrade_plugin_savepoint(true, 2013112100, 'enrol', 'self');
+     }
      return true;
  }