Merge branch 'mw-1.26'

1 files changed, 8 insertions, 0 deletions

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 63561552..147f67e8 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();