Fixing one little-little bug about user->ajax being nullable. MDL-8421

Merged from MOODLE_17_STABLE

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 841b4db07a7254c3f343712c3700e82fa1ed1c6f..4ceeabbc3852ea1d2906ef9692f11339fa32162b 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2130,7 +2130,7 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2006082800) {
-        table_column('user', '', 'ajax', 'integer', '1', 'unsigned', '1', '', 'htmleditor');
+        table_column('user', '', 'ajax', 'integer', '1', 'unsigned', '1', 'not null', 'htmleditor');
     }
 
     if ($oldversion < 2006082900) {

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index b2a4c1c3f71828a7f81fef9d556e07a64c8bcbfc..41ffe2468152d480dcea095d2dfd0a8a48fc2447 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1728,7 +1728,7 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2006082800) {
-        table_column('user', '', 'ajax', 'integer', '1', 'unsigned', '1', '', 'htmleditor');
+        table_column('user', '', 'ajax', 'integer', '1', 'unsigned', '1', 'not null', 'htmleditor');
     }
 
     if ($oldversion < 2006082900) {