From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 27 Aug 2015 01:40:43 +0000 (-0700)
Subject: Ignore DBPerformance thresholds in Special:ConfirmEmail
X-Git-Tag: 1.31.0-rc.0~10248^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=98479165b084c03b6b845961a00a80ff593a244f;p=lhc%2Fweb%2Fwiklou.git

Ignore DBPerformance thresholds in Special:ConfirmEmail

Bug: T92357
Change-Id: I81a1a31de522c2390e9d4d515677731cce4fcf1f
---

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 63561552a4..147f67e8d2 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -43,6 +43,10 @@ class EmailConfirmation extends UnlistedSpecialPage {
 	 * @throws UserNotLoggedIn
 	 */
 	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();
+
 		$this->setHeaders();
 
 		$this->checkReadOnly();
@@ -151,6 +155,10 @@ 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();
+
 		$this->setHeaders();
 		$this->checkReadOnly();
 		$this->checkPermissions();