Version 5.0.0 beta 11.1
This commit is contained in:
1 parent
264eeb97e0
commit
90e8c7e903
466 files changed
+7796
-2394
No files matched your search
@@ -89,13 +89,27 @@ class Upgrade
|
||||
->join( 'core_members', 'core_validating.member_id=core_members.member_id' )
|
||||
);
|
||||
|
||||
$toDelete = [];
|
||||
foreach( $pending as $row )
|
||||
{
|
||||
/* Update the database directly, we don't want to trigger any memberSync events */
|
||||
$newEmail = $row['email'];
|
||||
$oldEmail = $row['new_email']; // this was renamed from core_validating.prev_email
|
||||
Db::i()->update( 'core_members', [ 'email' => $oldEmail ], [ 'member_id=?', $row['member_id'] ] );
|
||||
Db::i()->update( 'core_validating', [ 'new_email' => $newEmail ], [ 'vid=?', $row['vid'] ] );
|
||||
if( $row['email'] )
|
||||
{
|
||||
$newEmail = $row['email'];
|
||||
$oldEmail = $row['new_email']; // this was renamed from core_validating.prev_email
|
||||
Db::i()->update( 'core_members', [ 'email' => $oldEmail ], [ 'member_id=?', $row['member_id'] ] );
|
||||
Db::i()->update( 'core_validating', [ 'new_email' => $newEmail ], [ 'vid=?', $row['vid'] ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
/* If there is no member record for this, delete it */
|
||||
$toDelete[] = $row['vid'];
|
||||
}
|
||||
}
|
||||
|
||||
if( count( $toDelete ) )
|
||||
{
|
||||
Db::i()->delete( 'core_validating', Db::i()->in( 'vid', $toDelete ) );
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
Reference in new issue
Block a user