From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Wed, 1 Apr 2015 12:23:20 +0000 (-0400)
Subject: API: Reduce volume of "continue format is changing" warning
X-Git-Tag: 1.31.0-rc.0~11905^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=6ab6a1ada0ddfdbbe6d9ab81a8ae4d4239d5272b;p=lhc%2Fweb%2Fwiklou.git

API: Reduce volume of "continue format is changing" warning

It's excessively difficult to determine if the logs of people hitting
this warning are really going to be affected by the change or if they're
making queries where it won't actually matter.

Since 1.26 is coming soon, and with it the decision as to whether to
pull the switch on I984e6358, let's retarget the warnings to those cases
where it's possible it would actually break someone's code.

Change-Id: I91f170fd7d4c791ca8f5d3592c888700f4d5aa97
---

diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index f4b64a3fa5..ac894193a3 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -249,16 +249,6 @@ class ApiQuery extends ApiBase {
 	public function execute() {
 		$this->mParams = $this->extractRequestParams();
 
-		if ( $this->mParams['continue'] === null && !$this->mParams['rawcontinue'] ) {
-			$this->logFeatureUsage( 'action=query&!rawcontinue&!continue' );
-			$this->setWarning(
-				'Formatting of continuation data will be changing soon. ' .
-				'To continue using the current formatting, use the \'rawcontinue\' parameter. ' .
-				'To begin using the new format, pass an empty string for \'continue\' ' .
-				'in the initial query.'
-			);
-		}
-
 		// Instantiate requested modules
 		$allModules = array();
 		$this->instantiateModules( $allModules, 'prop' );
@@ -304,6 +294,18 @@ class ApiQuery extends ApiBase {
 		$this->getResult()->endContinuation(
 			$this->mParams['continue'] === null ? 'raw' : 'standard'
 		);
+
+		if ( $this->mParams['continue'] === null && !$this->mParams['rawcontinue'] &&
+			array_key_exists( 'query-continue', $this->getResult()->getData() )
+		) {
+			$this->logFeatureUsage( 'action=query&!rawcontinue&!continue' );
+			$this->setWarning(
+				'Formatting of continuation data will be changing soon. ' .
+				'To continue using the current formatting, use the \'rawcontinue\' parameter. ' .
+				'To begin using the new format, pass an empty string for \'continue\' ' .
+				'in the initial query.'
+			);
+		}
 	}
 
 	/**