Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Mar 2017 04:07:50 +0000 (12:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Mar 2017 04:07:50 +0000 (12:07 +0800)
1  2 
lib/db/upgrade.php
mod/assign/locallib.php
version.php

@@@ -2555,5 -2555,29 +2555,29 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2017021400.00);
      }
  
 -    if ($oldversion < 2017030300.01) {
++    if ($oldversion < 2017030700.00) {
+         // Define field priority to be added to event.
+         $table = new xmldb_table('event');
+         $field = new xmldb_field('priority', XMLDB_TYPE_INTEGER, '10', null, null, null, null, 'subscriptionid');
+         // Conditionally launch add field priority.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
+         // Create adhoc task for upgrading of existing calendar events.
+         $record = new \stdClass();
+         $record->classname = "\\core\\task\\refresh_mod_calendar_events_task";
+         $record->component = 'core';
+         // Next run time based from nextruntime computation in \core\task\manager::queue_adhoc_task().
+         $nextruntime = time() - 1;
+         $record->nextruntime = $nextruntime;
+         $DB->insert_record('task_adhoc', $record);
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2017030300.01);
++        upgrade_main_savepoint(true, 2017030700.00);
+     }
      return true;
  }
Simple merge
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017030600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017030300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017030700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.