diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2022-07-03 17:18:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2022-07-03 17:18:03 +0000 |
| commit | 535b88470c68e9ba2c7dbeb8f82dc9e158f1bc06 (patch) | |
| tree | feb2919c7f6db7e9336fd15b06579b4d431cb498 /includes/specialpage | |
| parent | 762cc0acabfb0ded7ef3da9da0a839939e91b50f (diff) | |
| parent | ce824ff8f70c7d5ed9f2a671372dba5d9382fef7 (diff) | |
| download | mediawikicore-535b88470c68e9ba2c7dbeb8f82dc9e158f1bc06.tar.gz mediawikicore-535b88470c68e9ba2c7dbeb8f82dc9e158f1bc06.zip | |
Merge "specialpage: Fix deprecation for QueryPage::getSQL"
Diffstat (limited to 'includes/specialpage')
| -rw-r--r-- | includes/specialpage/QueryPage.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/includes/specialpage/QueryPage.php b/includes/specialpage/QueryPage.php index 2e78d7dcfda8..3f54b9175293 100644 --- a/includes/specialpage/QueryPage.php +++ b/includes/specialpage/QueryPage.php @@ -223,12 +223,7 @@ abstract class QueryPage extends SpecialPage { * @suppress PhanPluginNeverReturnMethod */ protected function getSQL() { - MWDebug::detectDeprecatedOverride( - $this, - __CLASS__, - 'getSQL', - '1.39' - ); + wfDeprecated( __METHOD__, '1.39' ); throw new MWException( "Bug in a QueryPage: doesn't implement getQueryInfo() nor " . "getQuery() properly" ); } @@ -535,6 +530,12 @@ abstract class QueryPage extends SpecialPage { ); } else { // Old-fashioned raw SQL style, deprecated + MWDebug::detectDeprecatedOverride( + $this, + __CLASS__, + 'getSQL', + '1.39' + ); $sql = $this->getSQL(); $sql .= ' ORDER BY ' . implode( ', ', $order ); $sql = $dbr->limitResult( $sql, $limit, $offset ); |