L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-mdl-38344' of git://github.com/rajeshtaneja/moodle

Browse Source 
Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Dan Poltawski
2013-04-02 16:23:44 +08:00
parent cc067484a8 e2e9ff6542
commit eee20b123b
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/install.xml
+1 -1
View File
@@ -488,7 +488,7 @@
<TABLE NAME="event" COMMENT="For everything with a time associated to it">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="name" TYPE="text" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="description" TYPE="text" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="format" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
<FIELD NAME="courseid" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
lib/db/upgrade.php
+11
View File
@@ -1974,5 +1974,16 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013040200.00);
}
if ($oldversion < 2013040201.00) {
// Convert name field in event table to text type as RFC-2445 doesn't have any limitation on it.
$table = new xmldb_table('event');
$field = new xmldb_field('name', XMLDB_TYPE_TEXT, null, null, XMLDB_NOTNULL, null, null);
if ($dbman->field_exists($table, $field)) {
$dbman->change_field_type($table, $field);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2013040201.00);
}
return true;
}
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013040200.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2013040201.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes