Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 13:41:13 +0000 (13:41 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 13:41:13 +0000 (13:41 +0000)
1  2 
lib/db/upgrade.php
lib/templates/login.mustache
theme/boost/templates/core/login.mustache
version.php

@@@ -2465,76 -2465,10 +2465,81 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2016122800.00);
      }
  
 -    if ($oldversion < 2017011900.00) {
 +    if ($oldversion < 2017020200.01) {
 +
 +        // Define index useridfrom_timeuserfromdeleted_notification (not unique) to be added to message.
 +        $table = new xmldb_table('message');
 +        $index = new xmldb_index('useridfrom_timeuserfromdeleted_notification', XMLDB_INDEX_NOTUNIQUE, array('useridfrom', 'timeuserfromdeleted', 'notification'));
 +
 +        // Conditionally launch add index useridfrom_timeuserfromdeleted_notification.
 +        if (!$dbman->index_exists($table, $index)) {
 +            $dbman->add_index($table, $index);
 +        }
 +
 +        // Define index useridto_timeusertodeleted_notification (not unique) to be added to message.
 +        $index = new xmldb_index('useridto_timeusertodeleted_notification', XMLDB_INDEX_NOTUNIQUE, array('useridto', 'timeusertodeleted', 'notification'));
 +
 +        // Conditionally launch add index useridto_timeusertodeleted_notification.
 +        if (!$dbman->index_exists($table, $index)) {
 +            $dbman->add_index($table, $index);
 +        }
 +
 +        $index = new xmldb_index('useridto', XMLDB_INDEX_NOTUNIQUE, array('useridto'));
 +
 +        // Conditionally launch drop index useridto.
 +        if ($dbman->index_exists($table, $index)) {
 +            $dbman->drop_index($table, $index);
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2017020200.01);
 +    }
 +
 +    if ($oldversion < 2017020200.02) {
 +
 +        // Define index useridfrom_timeuserfromdeleted_notification (not unique) to be added to message_read.
 +        $table = new xmldb_table('message_read');
 +        $index = new xmldb_index('useridfrom_timeuserfromdeleted_notification', XMLDB_INDEX_NOTUNIQUE, array('useridfrom', 'timeuserfromdeleted', 'notification'));
 +
 +        // Conditionally launch add index useridfrom_timeuserfromdeleted_notification.
 +        if (!$dbman->index_exists($table, $index)) {
 +            $dbman->add_index($table, $index);
 +        }
 +
 +        // Define index useridto_timeusertodeleted_notification (not unique) to be added to message_read.
 +        $index = new xmldb_index('useridto_timeusertodeleted_notification', XMLDB_INDEX_NOTUNIQUE, array('useridto', 'timeusertodeleted', 'notification'));
 +
 +        // Conditionally launch add index useridto_timeusertodeleted_notification.
 +        if (!$dbman->index_exists($table, $index)) {
 +            $dbman->add_index($table, $index);
 +        }
 +
 +        $index = new xmldb_index('useridto', XMLDB_INDEX_NOTUNIQUE, array('useridto'));
 +
 +        // Conditionally launch drop index useridto.
 +        if ($dbman->index_exists($table, $index)) {
 +            $dbman->drop_index($table, $index);
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2017020200.02);
 +    }
 +
 +    if ($oldversion < 2017020901.00) {
 +
 +        // Delete "orphaned" block positions. Note, the query does not use indexes (because there are none),
 +        // if it runs too long during upgrade you can comment this line - it will leave orphaned records
 +        // in the database but they won't bother you.
 +        upgrade_block_positions();
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2017020901.00);
 +    }
 +
++    if ($oldversion < 2017021300.00) {
+         unset_config('loginpasswordautocomplete');
 -        upgrade_main_savepoint(true, 2017011900.00);
++        upgrade_main_savepoint(true, 2017021300.00);
+     }
      return true;
  }
Simple merge
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017020901.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017011900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017021300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.