From fc97de7f30f0b3fba42b1aab83f2a72c84345655 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 15 Aug 2016 07:21:36 -0700 Subject: [PATCH] Replace blunt uses of resetExpectations() with setSilenced() for TransactionProfiler Change-Id: Ica42f56f61cd720a16754e93dc9c4792d66c7a0f --- includes/specials/SpecialConfirmemail.php | 7 ++++--- includes/specials/SpecialEmailInvalidate.php | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php index a656c2ea11..7b4e9db01e 100644 --- a/includes/specials/SpecialConfirmemail.php +++ b/includes/specials/SpecialConfirmemail.php @@ -49,10 +49,9 @@ class EmailConfirmation extends UnlistedSpecialPage { 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(); @@ -70,7 +69,9 @@ class EmailConfirmation extends UnlistedSpecialPage { $this->getOutput()->addWikiMsg( 'confirmemail_noemail' ); } } else { + $trxProfiler->setSilenced( true ); $this->attemptConfirm( $code ); + $trxProfiler->setSilenced( false ); } } @@ -146,7 +147,7 @@ class EmailConfirmation extends UnlistedSpecialPage { * * @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' ); diff --git a/includes/specials/SpecialEmailInvalidate.php b/includes/specials/SpecialEmailInvalidate.php index b5c66ff6dc..d2e3e7f132 100644 --- a/includes/specials/SpecialEmailInvalidate.php +++ b/includes/specials/SpecialEmailInvalidate.php @@ -39,12 +39,15 @@ class EmailInvalidation extends UnlistedSpecialPage { 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 ); } /** @@ -53,7 +56,7 @@ class EmailInvalidation extends UnlistedSpecialPage { * * @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' ); -- 2.20.1