Merge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle

Conflicts:
	mod/lesson/version.php
	mod/lesson/db/upgrade.php
	mod/lesson/db/install.xml

diff --cc mod/lesson/db/install.xml
index 29f858f,802994a..46fbbbb
--- 1/mod/lesson/db/install.xml
--- 2/mod/lesson/db/install.xml
+++ b/mod/lesson/db/install.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="UTF-8" ?>
- <XMLDB PATH="mod/lesson/db" VERSION="20120122" COMMENT="XMLDB file for Moodle mod/lesson"
 -<XMLDB PATH="mod/lesson/db" VERSION="20150201" COMMENT="XMLDB file for Moodle mod/lesson"
++<XMLDB PATH="mod/lesson/db" VERSION="20150303" COMMENT="XMLDB file for Moodle mod/lesson"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
  >

diff --cc mod/lesson/db/upgrade.php
index 1f91609,e82d424..9f52019
--- 1/mod/lesson/db/upgrade.php
--- 2/mod/lesson/db/upgrade.php
+++ b/mod/lesson/db/upgrade.php
@@@ -137,5 -137,21 +137,21 @@@ function xmldb_lesson_upgrade($oldversi
          // Lesson savepoint reached.
          upgrade_mod_savepoint(true, 2014122900, 'lesson');
      }
 -    if ($oldversion < 2015022500) {
+ 
 -        upgrade_mod_savepoint(true, 2015022500, 'lesson');
++    if ($oldversion < 2015030300) {
+ 
+         // Define field nextpageid to be added to lesson_branch.
+         $table = new xmldb_table('lesson_branch');
+         $field = new xmldb_field('nextpageid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'timeseen');
+ 
+         // Conditionally launch add field nextpageid.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
+ 
+         // Lesson savepoint reached.
++        upgrade_mod_savepoint(true, 2015030300, 'lesson');
+     }
+ 
      return true;
  }

diff --cc mod/lesson/version.php
index 000270d,6d29f8e..9a234f6
--- 1/mod/lesson/version.php
--- 2/mod/lesson/version.php
+++ b/mod/lesson/version.php
@@@ -24,7 -24,7 +24,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2015021900;       // The current module version (Date: YYYYMMDDXX)
 -$plugin->version   = 2015022500;    // The current module version (Date: YYYYMMDDXX)
++$plugin->version   = 2015030300;       // The current module version (Date: YYYYMMDDXX)
  $plugin->requires  = 2014110400;    // Requires this Moodle version
  $plugin->component = 'mod_lesson'; // Full name of the plugin (used for diagnostics)
  $plugin->cron      = 0;