Skip to content
Browse files

Merge branch 'MDL-29035-m20' of git://github.com/ankitagarwal/moodle …

…into MOODLE_20_STABLE
  • Loading branch information...
2 parents 1739fe7 + ce77d3e commit c8a5dfe0bdb2d380f171f1a074cb434ec75737db @stronk7 stronk7 committed Nov 11, 2011
Showing with 7 additions and 7 deletions.
  1. +7 −7 backup/util/dbops/restore_dbops.class.php
View
14 backup/util/dbops/restore_dbops.class.php
@@ -951,7 +951,7 @@ protected static function precheck_user($user, $samesite) {
AND mnethostid = ?
AND deleted = 1
AND (
- username LIKE ?
+ UPPER(username) LIKE UPPER(?)
OR (
".$DB->sql_isnotempty('user', 'email', false, false)."
AND email = ?
@@ -973,7 +973,7 @@ protected static function precheck_user($user, $samesite) {
FROM {user} u
WHERE id = ?
AND mnethostid = ?
- AND email = ?",
+ AND UPPER(email) = UPPER(?)",
array($user->id, $user->mnethostid, $trimemail))) {
return $rec; // Matching user, deleted in backup file found, return it
}
@@ -996,7 +996,7 @@ protected static function precheck_user($user, $samesite) {
WHERE username = ?
AND mnethostid = ?
AND (
- email = ?
+ UPPER(email) = UPPER(?)
OR (
firstaccess != 0
AND firstaccess = ?
@@ -1020,7 +1020,7 @@ protected static function precheck_user($user, $samesite) {
AND ".$DB->sql_isnotempty('user', 'email', false, false)."
AND email = ?
AND (
- username LIKE ?
+ UPPER(username) LIKE UPPER(?)
OR (
firstaccess != 0
AND firstaccess = ?
@@ -1038,7 +1038,7 @@ protected static function precheck_user($user, $samesite) {
FROM {user} u
WHERE mnethostid = ?
AND deleted = 1
- AND username LIKE ?
+ AND UPPER(username) LIKE UPPER(?)
AND firstaccess != 0
AND firstaccess = ?",
array($user->mnethostid, $user->email.'.%', $user->firstaccess))) {
@@ -1056,7 +1056,7 @@ protected static function precheck_user($user, $samesite) {
if ($rec = $DB->get_record_sql("SELECT *
FROM {user} u
WHERE mnethostid = ?
- AND email = ?
+ AND UPPER(email) = UPPER(?)
AND firstaccess != 0
AND firstaccess = ?",
array($user->mnethostid, $trimemail, $user->firstaccess))) {
@@ -1070,7 +1070,7 @@ protected static function precheck_user($user, $samesite) {
WHERE username = ?
AND mnethostid = ?
AND NOT (
- email = ?
+ UPPER(email) = UPPER(?)
OR (
firstaccess != 0
AND firstaccess = ?

0 comments on commit c8a5dfe

Please sign in to comment.
Something went wrong with that request. Please try again.