function execute( $code ) {
// Ignore things like master queries/connections on GET requests.
// It's very convenient to just allow formless link usage.
- Profiler::instance()->getTransactionProfiler()->resetExpectations();
+ $trxProfiler = Profiler::instance()->getTransactionProfiler();
$this->setHeaders();
-
$this->checkReadOnly();
$this->checkPermissions();
$this->getOutput()->addWikiMsg( 'confirmemail_noemail' );
}
} else {
+ $trxProfiler->setSilenced( true );
$this->attemptConfirm( $code );
+ $trxProfiler->setSilenced( false );
}
}
*
* @param string $code Confirmation code
*/
- function attemptConfirm( $code ) {
+ private function attemptConfirm( $code ) {
$user = User::newFromConfirmationCode( $code, User::READ_LATEST );
if ( !is_object( $user ) ) {
$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
function execute( $code ) {
// Ignore things like master queries/connections on GET requests.
// It's very convenient to just allow formless link usage.
- Profiler::instance()->getTransactionProfiler()->resetExpectations();
+ $trxProfiler = Profiler::instance()->getTransactionProfiler();
$this->setHeaders();
$this->checkReadOnly();
$this->checkPermissions();
+
+ $trxProfiler->setSilenced( true );
$this->attemptInvalidate( $code );
+ $trxProfiler->setSilenced( false );
}
/**
*
* @param string $code Confirmation code
*/
- function attemptInvalidate( $code ) {
+ private function attemptInvalidate( $code ) {
$user = User::newFromConfirmationCode( $code, User::READ_LATEST );
if ( !is_object( $user ) ) {
$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );