Permalink
Browse files

Merged MDL-29254 with conflict resolution

  • Loading branch information...
2 parents f37f43f + 3c5ea52 commit 7e87a3af321c4b71dde7cd6f4daffcb52c7c6e9a Sam Hemelryk committed Feb 20, 2012
Showing with 32 additions and 1 deletion.
  1. +31 −0 lib/db/upgrade.php
  2. +1 −1 version.php
View
@@ -6722,6 +6722,37 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2011070104.08);
}
+
+ if ($oldversion < 2011070104.09) {
+ // Somewhere before 1.9 summary and content column in post table were not null. In 1.9+
+ // not null became false.
+ $columns = $DB->get_columns('post');
+
+ // Fix discrepancies in summary field after upgrade from 1.9
+ if (array_key_exists('summary', $columns) && $columns['summary']->not_null != false) {
+ $table = new xmldb_table('post');
+ $summaryfield = new xmldb_field('summary', XMLDB_TYPE_TEXT, 'big', null, null, null, null, 'subject');
+
+ if ($dbman->field_exists($table, $summaryfield)) {
+ $dbman->change_field_notnull($table, $summaryfield);
+ }
+
+ }
+
+ // Fix discrepancies in content field after upgrade from 1.9
+ if (array_key_exists('content', $columns) && $columns['content']->not_null != false) {
+ $table = new xmldb_table('post');
+ $contentfield = new xmldb_field('content', XMLDB_TYPE_TEXT, 'big', null, null, null, null, 'summary');
+
+ if ($dbman->field_exists($table, $contentfield)) {
+ $dbman->change_field_notnull($table, $contentfield);
+ }
+
+ }
+
+ upgrade_main_savepoint(true, 2011070104.09);
+ }
+
return true;
}
View
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2011070104.08; // 20110701 = branching date YYYYMMDD - do not modify!
+$version = 2011070104.09; // 20110701 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes

0 comments on commit 7e87a3a

Please sign in to comment.