Version 5.0.0 beta 9
This commit is contained in:
1 parent
214f649f1d
commit
56979f8ee8
202 files changed
+4403
-1123
No files matched your search
@@ -2013,18 +2013,7 @@ class members extends Controller
|
||||
|
||||
/* Change */
|
||||
$oldEmail = $member->email;
|
||||
$member->email = Request::i()->email;
|
||||
$member->save();
|
||||
foreach ( Login::methods() as $method )
|
||||
{
|
||||
try
|
||||
{
|
||||
$method->changeEmail( $member, $oldEmail, Request::i()->email );
|
||||
}
|
||||
catch( BadMethodCallException $e ) {}
|
||||
}
|
||||
$member->logHistory( 'core', 'email_change', array( 'old' => $oldEmail, 'new' => Request::i()->email, 'by' => 'manual' ) );
|
||||
Event::fire( 'onEmailChange', $member, array( Request::i()->email, $oldEmail ) );
|
||||
$member->changeEmail( Request::i()->email );
|
||||
$member->invalidateSessionsAndLogins( TRUE, Session::i()->id );
|
||||
Session::i()->log( 'acplog__members_edited_email', array( $member->name => FALSE ) );
|
||||
}
|
||||
@@ -2845,12 +2834,12 @@ class members extends Controller
|
||||
/* New Reg */
|
||||
elseif ( $row['new_reg'] )
|
||||
{
|
||||
Email::buildFromTemplate( 'core', 'registration_validate', array( $member, $row['vid'], $plainTextKey ), Email::TYPE_TRANSACTIONAL )->send( $member );
|
||||
Email::buildFromTemplate( 'core', 'registration_validate', array( $member, $row['vid'], $plainTextKey, $row['new_email'] ), Email::TYPE_TRANSACTIONAL )->send( $member );
|
||||
}
|
||||
/* Email Change */
|
||||
elseif ( $row['email_chg'] )
|
||||
{
|
||||
Email::buildFromTemplate( 'core', 'email_change', array( $member, $row['vid'], $plainTextKey ), Email::TYPE_TRANSACTIONAL )->send( $member );
|
||||
Email::buildFromTemplate( 'core', 'email_change', array( $member, $row['vid'], $plainTextKey, $row['new_email'] ), Email::TYPE_TRANSACTIONAL )->send( $row['new_email'], array(), array(), NULL, NULL, array( 'Reply-To' => Settings::i()->email_in ) );
|
||||
}
|
||||
/* Forgot security answers */
|
||||
elseif ( $row['forgot_security'] )
|
||||
@@ -3199,7 +3188,7 @@ class members extends Controller
|
||||
|
||||
Session::i()->log( 'acplog__deleted_guest_content', array( $values['guest_name_to_delete'] => FALSE ) );
|
||||
|
||||
Output::i()->redirect( Url::internal( "app=core&module=moderation&controller=spam&searchResult=guest_captcha" ), 'deleted' );
|
||||
Output::i()->redirect( Url::internal( "app=core&module=moderation&controller=spam" ), 'deleted' );
|
||||
}
|
||||
|
||||
Output::i()->output = $form;
|
||||
|
||||
Reference in new issue
Block a user