Merge branch 'MDL-33562-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 22:48:50 +0000 (00:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 22:48:50 +0000 (00:48 +0200)
Conflicts:
version.php

1  2 
lib/db/upgrade.php
lib/moodlelib.php
version.php

@@@ -1187,5 -1187,14 +1187,14 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2012062507.01);
      }
  
 -    if ($oldversion < 2012062507.04) {
++    if ($oldversion < 2012062507.06) {
+         // Clean up old tokens which haven't been deleted.
+         $DB->execute("DELETE FROM {user_private_key} WHERE NOT EXISTS
+                          (SELECT 'x' FROM {user} WHERE deleted = 0 AND id = userid)");
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2012062507.04);
++        upgrade_main_savepoint(true, 2012062507.06);
+     }
      return true;
  }
Simple merge
diff --cc version.php
@@@ -29,8 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2012062507.05;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012062507.04;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012062507.06;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes