diff --git a/lib/db/install.xml b/lib/db/install.xml index 8eb4f74ac38..fab9fd7ebda 100644 --- a/lib/db/install.xml +++ b/lib/db/install.xml @@ -537,7 +537,7 @@ - + @@ -565,7 +565,7 @@ - + diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 93215db196c..490f2ba532f 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -2228,10 +2228,10 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2016100501.00); } - if ($oldversion < 2016100700.01) { + if ($oldversion < 2016101000.00) { // Define field component to be added to message. $table = new xmldb_table('message'); - $field = new xmldb_field('component', XMLDB_TYPE_CHAR, '200', null, null, null, null, 'timeusertodeleted'); + $field = new xmldb_field('component', XMLDB_TYPE_CHAR, '100', null, null, null, null, 'timeusertodeleted'); // Conditionally launch add field component. if (!$dbman->field_exists($table, $field)) { @@ -2246,9 +2246,14 @@ function xmldb_main_upgrade($oldversion) { $dbman->add_field($table, $field); } + // Main savepoint reached. + upgrade_main_savepoint(true, 2016101000.00); + } + + if ($oldversion < 2016101000.01) { // Define field component to be added to message_read. $table = new xmldb_table('message_read'); - $field = new xmldb_field('component', XMLDB_TYPE_CHAR, '200', null, null, null, null, 'timeusertodeleted'); + $field = new xmldb_field('component', XMLDB_TYPE_CHAR, '100', null, null, null, null, 'timeusertodeleted'); // Conditionally launch add field component. if (!$dbman->field_exists($table, $field)) { @@ -2264,7 +2269,7 @@ function xmldb_main_upgrade($oldversion) { } // Main savepoint reached. - upgrade_main_savepoint(true, 2016100700.01); + upgrade_main_savepoint(true, 2016101000.01); } return true; diff --git a/version.php b/version.php index 50be8c8f421..60a910354ef 100644 --- a/version.php +++ b/version.php @@ -29,11 +29,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2016100700.01; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2016101000.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. -$release = '3.2dev (Build: 20161007)'; // Human-friendly version name +$release = '3.2dev (Build: 20161010)'; // Human-friendly version name $branch = '32'; // This version's branch. $maturity = MATURITY_ALPHA; // This version's maturity level.