Merge branch 'MDL-50602-master' of https://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 15:02:41 +0000 (16:02 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 15:03:52 +0000 (16:03 +0100)
1  2 
backup/upgrade.txt
lang/en/moodle.php
lib/db/upgrade.php
version.php

@@@ -1,6 -1,11 +1,11 @@@
  This files describes API changes in /backup/*,
  information provided here is intended especially for developers.
  
 -  renamed to backup_auto_max_kept.
+ === 3.0 ===
+ * The backup_auto_keep setting, in automated backups configuration, is now
++  renamed to backup_auto_max_kept as part of a rationalise of naming (see MDL-50602)
  === 2.6 ===
  
  * The backup_controller_dbops::create_temptable_from_real_table()
Simple merge
@@@ -4572,5 -4572,17 +4572,17 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2015092200.00);
      }
  
 -    if ($oldversion < 2015092400.01) {
++    if ($oldversion < 2015092900.00) {
+         // Rename backup_auto_keep setting to backup_auto_max_kept.
+         $keep = get_config('backup', 'backup_auto_keep');
+         if ($keep !== false) {
+             set_config('backup_auto_max_kept', $keep, 'backup');
+             unset_config('backup_auto_keep', 'backup');
+         }
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2015092400.01);
++        upgrade_main_savepoint(true, 2015092900.00);
+     }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015092800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015092400.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015092900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.