Compare commits
3 commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
a955c2ee85 | ||
![]() |
7086dab123 | ||
![]() |
fb0b1fe603 |
4 changed files with 2770 additions and 2534 deletions
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"require-dev": {
|
||||
"mediawiki/mediawiki-codesniffer": "45.0.0",
|
||||
"mediawiki/minus-x": "1.1.3",
|
||||
"php-parallel-lint/php-console-highlighter": "1.0.0",
|
||||
"php-parallel-lint/php-parallel-lint": "1.4.0"
|
||||
"mediawiki/mediawiki-codesniffer": "38.0.0",
|
||||
"mediawiki/minus-x": "1.1.1",
|
||||
"php-parallel-lint/php-console-highlighter": "0.5.0",
|
||||
"php-parallel-lint/php-parallel-lint": "1.3.1"
|
||||
},
|
||||
"scripts": {
|
||||
"fix": [
|
||||
|
@ -16,10 +16,5 @@
|
|||
"minus-x check ."
|
||||
],
|
||||
"phpcs": "phpcs -sp --cache"
|
||||
},
|
||||
"config": {
|
||||
"allow-plugins": {
|
||||
"dealerdirect/phpcodesniffer-composer-installer": true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
5251
package-lock.json
generated
5251
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -5,9 +5,9 @@
|
|||
"test": "grunt test"
|
||||
},
|
||||
"devDependencies": {
|
||||
"eslint-config-wikimedia": "0.28.2",
|
||||
"grunt": "1.6.1",
|
||||
"grunt-banana-checker": "0.13.0",
|
||||
"grunt-eslint": "24.3.0"
|
||||
"eslint-config-wikimedia": "0.21.0",
|
||||
"grunt": "1.5.3",
|
||||
"grunt-banana-checker": "0.9.0",
|
||||
"grunt-eslint": "23.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,8 +33,7 @@ class ContributionScores extends IncludableSpecialPage {
|
|||
}
|
||||
|
||||
$user = User::newFromName( $usertext );
|
||||
$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
|
||||
$dbr = $loadBalancer->getConnection( DB_REPLICA );
|
||||
$dbr = wfGetDB( DB_REPLICA );
|
||||
|
||||
if ( $user instanceof User && $user->isRegistered() ) {
|
||||
global $wgLang;
|
||||
|
@ -77,7 +76,7 @@ class ContributionScores extends IncludableSpecialPage {
|
|||
} else {
|
||||
$output = wfMessage( 'contributionscores-invalidusername' )->text();
|
||||
}
|
||||
return $parser->insertStripItem( $output, $parser->getStripState() );
|
||||
return $parser->insertStripItem( $output, $parser->mStripState );
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -91,8 +90,7 @@ class ContributionScores extends IncludableSpecialPage {
|
|||
global $wgContribScoreIgnoreBots, $wgContribScoreIgnoreBlockedUsers, $wgContribScoreIgnoreUsernames,
|
||||
$wgContribScoreUseRoughEditCount;
|
||||
|
||||
$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
|
||||
$dbr = $loadBalancer->getConnection( DB_REPLICA );
|
||||
$dbr = wfGetDB( DB_REPLICA );
|
||||
|
||||
$revQuery = ActorMigration::newMigration()->getJoin( 'rev_user' );
|
||||
$revQuery['tables'] = array_merge( [ 'revision' ], $revQuery['tables'] );
|
||||
|
@ -121,21 +119,7 @@ class ContributionScores extends IncludableSpecialPage {
|
|||
|
||||
if ( $wgContribScoreIgnoreBlockedUsers ) {
|
||||
$sqlWhere[] = "{$revUser} NOT IN " .
|
||||
$dbr->buildSelectSubquery( [
|
||||
'block',
|
||||
'block_target'
|
||||
],
|
||||
'bt_user',
|
||||
'bt_user <> 0',
|
||||
__METHOD__,
|
||||
[],
|
||||
[
|
||||
'block_target' => [ 'JOIN', [
|
||||
'bl_target=bt_id'
|
||||
] ]
|
||||
]
|
||||
);
|
||||
|
||||
$dbr->buildSelectSubquery( 'ipblocks', 'ipb_user', 'ipb_user <> 0', __METHOD__ );
|
||||
}
|
||||
|
||||
if ( $wgContribScoreIgnoreBots ) {
|
||||
|
@ -201,6 +185,7 @@ class ContributionScores extends IncludableSpecialPage {
|
|||
__METHOD__,
|
||||
[
|
||||
'ORDER BY' => 'wiki_rank DESC',
|
||||
'GROUP BY' => 'user_name',
|
||||
'LIMIT' => $limit,
|
||||
],
|
||||
[
|
||||
|
@ -406,7 +391,7 @@ class ContributionScores extends IncludableSpecialPage {
|
|||
$out->addWikiMsg( 'contributionscores-info' );
|
||||
|
||||
foreach ( $wgContribScoreReports as $scoreReport ) {
|
||||
[ $days, $revs ] = $scoreReport;
|
||||
list( $days, $revs ) = $scoreReport;
|
||||
if ( $days > 0 ) {
|
||||
$reportTitle = $this->msg( 'contributionscores-days' )->numParams( $days )->text();
|
||||
} else {
|
||||
|
@ -422,11 +407,6 @@ class ContributionScores extends IncludableSpecialPage {
|
|||
}
|
||||
}
|
||||
|
||||
public function maxIncludeCacheTime() {
|
||||
global $wgContribScoreDisableCache, $wgContribScoreCacheTTL;
|
||||
return $wgContribScoreDisableCache ? 0 : $wgContribScoreCacheTTL;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
|
|
Loading…
Add table
Reference in a new issue