X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialEmailInvalidate.php;h=c54abadd541b1b45c330f0fc8123b23e13f5dd90;hb=95d108845fe6545ebb52c8cc274ac76c444dde19;hp=b5c66ff6dc0f8def4c4d97ee0cbe0c82a29669b9;hpb=ed5e9a27d9d32f9689554d9bbcd4eb16beac24f6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialEmailInvalidate.php b/includes/specials/SpecialEmailInvalidate.php
index b5c66ff6dc..c54abadd54 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();
+
+		$old = $trxProfiler->setSilenced( true );
 		$this->attemptInvalidate( $code );
+		$trxProfiler->setSilenced( $old );
 	}
 
 	/**
@@ -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' );