Merge branch 'MDL-50664-master' of git://github.com/ryanwyllie/moodle

diff --cc mod/data/db/upgrade.php
index 602552a,b02948f..fd34e52
--- 1/mod/data/db/upgrade.php
--- 2/mod/data/db/upgrade.php
+++ b/mod/data/db/upgrade.php
@@@ -153,5 -153,20 +153,20 @@@ function xmldb_data_upgrade($oldversion
      // Moodle v2.9.0 release upgrade line.
      // Put any upgrade step following this.
  
 -    if ($oldversion < 2015070300) {
++    if ($oldversion < 2015092200) {
+ 
+         // Define field manageapproved to be added to data.
+         $table = new xmldb_table('data');
+         $field = new xmldb_field('manageapproved', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '1', 'approval');
+ 
+         // Conditionally launch add field manageapproved.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
+ 
+         // Data savepoint reached.
 -        upgrade_mod_savepoint(true, 2015070300, 'data');
++        upgrade_mod_savepoint(true, 2015092200, 'data');
+     }
+ 
      return true;
  }

diff --cc mod/data/version.php
index 27eeca5,11903fe..08ed9c7
--- 1/mod/data/version.php
--- 2/mod/data/version.php
+++ b/mod/data/version.php
@@@ -24,7 -24,7 +24,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2015051100;       // The current module version (Date: YYYYMMDDXX)
 -$plugin->version   = 2015070300;       // The current module version (Date: YYYYMMDDXX)
++$plugin->version   = 2015092200;       // The current module version (Date: YYYYMMDDXX)
  $plugin->requires  = 2015050500;       // Requires this Moodle version
  $plugin->component = 'mod_data';       // Full name of the plugin (used for diagnostics)
  $plugin->cron      = 0;