Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-33562-25' of git://github.com/danpoltawski/moodle i…

…nto MOODLE_25_STABLE

Conflicts:
	lib/db/upgrade.php
	version.php
  • Loading branch information...
commit a831f154aed9764d50d2273360a99a12587f9ca6 2 parents 54c7d51 + 068373c
@stronk7 stronk7 authored
Showing with 13 additions and 1 deletion.
  1. +9 −0 lib/db/upgrade.php
  2. +3 −0  lib/moodlelib.php
  3. +1 −1  version.php
View
9 lib/db/upgrade.php
@@ -2163,5 +2163,14 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013051400.01);
}
+ if ($oldversion < 2013051400.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, 2013051400.06);
+ }
+
return true;
}
View
3  lib/moodlelib.php
@@ -4078,6 +4078,9 @@ function delete_user(stdClass $user) {
// unauthorise the user for all services
$DB->delete_records('external_services_users', array('userid'=>$user->id));
+ // Remove users private keys.
+ $DB->delete_records('user_private_key', array('userid' => $user->id));
+
// force logout - may fail if file based sessions used, sorry
session_kill_user($user->id);
View
2  version.php
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2013051400.05; // 20130514 = branching date YYYYMMDD - do not modify!
+$version = 2013051400.06; // 20130514 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
Please sign in to comment.
Something went wrong with that request. Please try again.