Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205875
Change subject: API: Remove warning about continuation change
......................................................................
API: Remove warning about continuation change
Change-Id: I2a69e8ae7dc7df915ceaaeed740b74d55f9207ce
---
M includes/api/ApiQuery.php
M tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
M tests/phpunit/includes/api/query/ApiQueryTestBase.php
3 files changed, 0 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/205875/1
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 2b18f6c..f4e1acb 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -301,17 +301,6 @@
} else {
$continuationManager->setContinuationIntoResult(
$this->getResult() );
}
-
- /// @todo: Remove this after a suitable period of time. When
REL1_26 is cut, if not before.
- if ( $this->mParams['continue'] === null &&
!$this->mParams['rawcontinue'] &&
- $this->getResult()->getResultData( 'continue' ) !== null
- ) {
- $this->setWarning(
- 'Formatting of continuation data has changed. '
.
- 'To receive raw query-continue data, use the
\'rawcontinue\' parameter. ' .
- 'To silence this warning, pass an empty string
for \'continue\' in the initial query.'
- );
- }
}
/**
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
index db61bc8..72aaa34 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
@@ -57,10 +57,6 @@
} else {
$params['action'] = 'query';
}
- // Silence warning
- if ( !isset( $params['continue'] ) ) {
- $params['continue'] = '';
- }
$count = 0;
$result = array();
$continue = array();
diff --git a/tests/phpunit/includes/api/query/ApiQueryTestBase.php
b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
index d5fa454..25d1efc 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTestBase.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
@@ -100,10 +100,6 @@
if ( !array_key_exists( 'action', $req ) ) {
$req['action'] = 'query';
}
- // Silence warning
- if ( !isset( $params['continue'] ) ) {
- $params['continue'] = '';
- }
foreach ( $req as &$val ) {
if ( is_array( $val ) ) {
$val = implode( '|', array_unique( $val ) );
--
To view, visit https://gerrit.wikimedia.org/r/205875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a69e8ae7dc7df915ceaaeed740b74d55f9207ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
