Merge branch 'wip-MSFTMPP-136-m28' into MOODLE_28_STABLE

microsoft · Mar 16, 2015 · 4d76347 · 4d76347
2 parents 5f87298 + 0eef33f
commit 4d76347
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/auth/oidc/db/install.xml b/auth/oidc/db/install.xml
@@ -11,7 +11,7 @@
         <FIELD NAME="state" TYPE="char" LENGTH="15" NOTNULL="true" SEQUENCE="false" COMMENT="random state"/>
         <FIELD NAME="nonce" TYPE="char" LENGTH="15" NOTNULL="true" SEQUENCE="false" COMMENT="nonce"/>
         <FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" COMMENT="time login initiated"/>
-        <FIELD NAME="additionaldata" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="additional stored parameters"/>
+        <FIELD NAME="additionaldata" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="additional stored parameters"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>

diff --git a/auth/oidc/db/upgrade.php b/auth/oidc/db/upgrade.php
@@ -44,7 +44,7 @@ function xmldb_auth_oidc_upgrade($oldversion) {
 
     if ($result && $oldversion < 2015012702) {
         $table = new xmldb_table('auth_oidc_state');
-        $field = new xmldb_field('additionaldata', XMLDB_TYPE_TEXT, null, null, XMLDB_NOTNULL, null, null, 'timecreated');
+        $field = new xmldb_field('additionaldata', XMLDB_TYPE_TEXT, null, null, null, null, null, 'timecreated');
         if (!$dbman->field_exists($table, $field)) {
             $dbman->add_field($table, $field);
         }

diff --git a/auth/oidc/version.php b/auth/oidc/version.php
@@ -23,7 +23,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2015012704;
+$plugin->version = 2015012705;
 $plugin->requires = 2014111000;
 $plugin->component = 'auth_oidc';
 $plugin->maturity = MATURITY_STABLE;