Merge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/moodle

Conflicts:
	version.php

diff --cc lib/db/install.xml
Simple merge

diff --cc lib/db/upgrade.php
index 8e1043d,acdceb7..355884d
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -2999,23 -2993,23 +2999,38 @@@ function xmldb_main_upgrade($oldversion
          }
  
          // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2014020500.00);
 +        upgrade_main_savepoint(true, 2014021300.01);
 +    }
 +
 +    if ($oldversion < 2014021300.02) {
 +
 +        // Define field variant to be added to question_response_analysis.
 +        $table = new xmldb_table('question_response_analysis');
 +        $field = new xmldb_field('variant', XMLDB_TYPE_INTEGER, '10', null, null, null, null, 'questionid');
 +
 +        // Conditionally launch add field variant.
 +        if (!$dbman->field_exists($table, $field)) {
 +            $dbman->add_field($table, $field);
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2014021300.02);
      }
  
 -    if ($oldversion < 2014020700.02) {
++    if ($oldversion < 2014021800.00) {
+ 
+         // Define field queued to be added to portfolio_tempdata.
+         $table = new xmldb_table('portfolio_tempdata');
+         $field = new xmldb_field('queued', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '0', 'instance');
+ 
+         // Conditionally launch add field queued.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
+ 
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2014020700.02);
++        upgrade_main_savepoint(true, 2014021800.00);
+     }
+ 
      return true;
  }

diff --cc version.php
index 09067e7,61285cb..6edf128
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2014021300.02;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2014020700.02;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2014021800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.