From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 16 Aug 2016 20:28:54 +0000 (+0000)
Subject: Merge "Replace blunt uses of resetExpectations() with setSilenced() for TransactionPr... 
X-Git-Tag: 1.31.0-rc.0~6045
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=b5e308c4e1232d43c2369006ddcd552341bcaece;hp=39c9194bd504c0bf6903fe9e49f764f73b08460f;p=lhc%2Fweb%2Fwiklou.git

Merge "Replace blunt uses of resetExpectations() with setSilenced() for TransactionProfiler"
---

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' );