MtDu has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326384 )
Change subject: Replace Linker::link*() usage with LinkRenderer and conver to
use [] array syntax
......................................................................
Replace Linker::link*() usage with LinkRenderer and conver to use [] array
syntax
Change-Id: I6a79a40f7da4b08e70bb3196da5a623a788572e7
---
M ApprovedRevs.alias.php
M ApprovedRevs.hooks.php
M ApprovedRevs.i18n.magic.php
M ApprovedRevs.i18n.php
M ApprovedRevs.php
M ApprovedRevs_body.php
M SpecialApprovedRevsPage.php
M maintenance/approveAllPages.php
8 files changed, 248 insertions(+), 245 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs
refs/changes/84/326384/1
diff --git a/ApprovedRevs.alias.php b/ApprovedRevs.alias.php
index 8827e6b..bd04764 100644
--- a/ApprovedRevs.alias.php
+++ b/ApprovedRevs.alias.php
@@ -5,164 +5,164 @@
*/
// @codingStandardsIgnoreFile
-$specialPageAliases = array();
+$specialPageAliases = [];
/** English (English) */
-$specialPageAliases['en'] = array(
- 'ApprovedRevs' => array( 'ApprovedRevs', 'ApprovedPages',
'UnapprovedPages' ),
-);
+$specialPageAliases['en'] = [
+ 'ApprovedRevs' => [ 'ApprovedRevs', 'ApprovedPages', 'UnapprovedPages'
],
+];
/** Arabic (العربية) */
-$specialPageAliases['ar'] = array(
- 'ApprovedRevs' => array( 'مراجعات_موفقة', 'صفحات_موفقة',
'صفحات_غير_موفقة' ),
-);
+$specialPageAliases['ar'] = [
+ 'ApprovedRevs' => [ 'مراجعات_موفقة', 'صفحات_موفقة', 'صفحات_غير_موفقة' ],
+];
/** Egyptian Arabic (مصرى) */
-$specialPageAliases['arz'] = array(
- 'ApprovedRevs' => array( 'مراجعات_متوفقه', 'صفحات_متوافق_عليها',
'صفحات_مش_متوافق_عليها' ),
-);
+$specialPageAliases['arz'] = [
+ 'ApprovedRevs' => [ 'مراجعات_متوفقه', 'صفحات_متوافق_عليها',
'صفحات_مش_متوافق_عليها' ],
+];
/** Western Balochi (بلوچی رخشانی) */
-$specialPageAliases['bgn'] = array(
- 'ApprovedRevs' => array( 'سابیت_بوته_ئین_نخسه_ئان' ),
-);
+$specialPageAliases['bgn'] = [
+ 'ApprovedRevs' => [ 'سابیت_بوته_ئین_نخسه_ئان' ],
+];
/** Min Dong Chinese (Mìng-dĕ̤ng-ngṳ̄) */
-$specialPageAliases['cdo'] = array(
- 'ApprovedRevs' => array( '贊同其審閱' ),
-);
+$specialPageAliases['cdo'] = [
+ 'ApprovedRevs' => [ '贊同其審閱' ],
+];
/** German (Deutsch) */
-$specialPageAliases['de'] = array(
- 'ApprovedRevs' => array( 'Bestätigte_Versionen', 'Bestätigte_Seiten',
'Unbestätigte_Seiten' ),
-);
+$specialPageAliases['de'] = [
+ 'ApprovedRevs' => [ 'Bestätigte_Versionen', 'Bestätigte_Seiten',
'Unbestätigte_Seiten' ],
+];
/** Zazaki (Zazaki) */
-$specialPageAliases['diq'] = array(
- 'ApprovedRevs' => array( 'RewizyoniAraştkerden' ),
-);
+$specialPageAliases['diq'] = [
+ 'ApprovedRevs' => [ 'RewizyoniAraştkerden' ],
+];
/** Esperanto (Esperanto) */
-$specialPageAliases['eo'] = array(
- 'ApprovedRevs' => array( 'Aprobitaj_revizioj' ),
-);
+$specialPageAliases['eo'] = [
+ 'ApprovedRevs' => [ 'Aprobitaj_revizioj' ],
+];
/** Persian (فارسی) */
-$specialPageAliases['fa'] = array(
- 'ApprovedRevs' => array( 'نسخه‌های_تثبیت‌شده' ),
-);
+$specialPageAliases['fa'] = [
+ 'ApprovedRevs' => [ 'نسخه‌های_تثبیت‌شده' ],
+];
/** Galician (galego) */
-$specialPageAliases['gl'] = array(
- 'ApprovedRevs' => array( 'Aprobación_de_revisións' ),
-);
+$specialPageAliases['gl'] = [
+ 'ApprovedRevs' => [ 'Aprobación_de_revisións' ],
+];
/** Xiang Chinese (湘语) */
-$specialPageAliases['hsn'] = array(
- 'ApprovedRevs' => array( '受认定版本', '受认定页面', '冇认定个页面' ),
-);
+$specialPageAliases['hsn'] = [
+ 'ApprovedRevs' => [ '受认定版本', '受认定页面', '冇认定个页面' ],
+];
/** Haitian (Kreyòl ayisyen) */
-$specialPageAliases['ht'] = array(
- 'ApprovedRevs' => array( 'RevAprouve', 'PajAprouve', 'PajPaAprouve' ),
-);
+$specialPageAliases['ht'] = [
+ 'ApprovedRevs' => [ 'RevAprouve', 'PajAprouve', 'PajPaAprouve' ],
+];
/** Interlingua (interlingua) */
-$specialPageAliases['ia'] = array(
- 'ApprovedRevs' => array( 'Versiones_approbate' ),
-);
+$specialPageAliases['ia'] = [
+ 'ApprovedRevs' => [ 'Versiones_approbate' ],
+];
/** Italian (italiano) */
-$specialPageAliases['it'] = array(
- 'ApprovedRevs' => array( 'VersioniApprovate' ),
-);
+$specialPageAliases['it'] = [
+ 'ApprovedRevs' => [ 'VersioniApprovate' ],
+];
/** Korean (한국어) */
-$specialPageAliases['ko'] = array(
- 'ApprovedRevs' => array( '개정판승인', '문서승인' ),
-);
+$specialPageAliases['ko'] = [
+ 'ApprovedRevs' => [ '개정판승인', '문서승인' ],
+];
/** Cornish (kernowek) */
-$specialPageAliases['kw'] = array(
- 'ApprovedRevs' => array( 'AmendyansowKomendys' ),
-);
+$specialPageAliases['kw'] = [
+ 'ApprovedRevs' => [ 'AmendyansowKomendys' ],
+];
/** Luxembourgish (Lëtzebuergesch) */
-$specialPageAliases['lb'] = array(
- 'ApprovedRevs' => array( 'Net_nogekuckt_Säiten' ),
-);
+$specialPageAliases['lb'] = [
+ 'ApprovedRevs' => [ 'Net_nogekuckt_Säiten' ],
+];
/** Northern Luri (لۊری شومالی) */
-$specialPageAliases['lrc'] = array(
- 'ApprovedRevs' => array( 'ڤانئیأریا_تأصیق_بیە', 'بألگە_یا_تصیق_بییھ',
'بلگە_یا_تصیق_نبیە' ),
-);
+$specialPageAliases['lrc'] = [
+ 'ApprovedRevs' => [ 'ڤانئیأریا_تأصیق_بیە', 'بألگە_یا_تصیق_بییھ',
'بلگە_یا_تصیق_نبیە' ],
+];
/** Malagasy (Malagasy) */
-$specialPageAliases['mg'] = array(
- 'ApprovedRevs' => array( 'VersionaEkena', 'PejyEkena' ),
-);
+$specialPageAliases['mg'] = [
+ 'ApprovedRevs' => [ 'VersionaEkena', 'PejyEkena' ],
+];
/** Macedonian (македонски) */
-$specialPageAliases['mk'] = array(
- 'ApprovedRevs' => array( 'ОдобрениПреработки' ),
-);
+$specialPageAliases['mk'] = [
+ 'ApprovedRevs' => [ 'ОдобрениПреработки' ],
+];
/** Malayalam (മലയാളം) */
-$specialPageAliases['ml'] = array(
- 'ApprovedRevs' => array( 'അംഗീകൃതതാളുകൾ', 'അംഗീകൃതമല്ലാത്തതാളുകൾ' ),
-);
+$specialPageAliases['ml'] = [
+ 'ApprovedRevs' => [ 'അംഗീകൃതതാളുകൾ', 'അംഗീകൃതമല്ലാത്തതാളുകൾ' ],
+];
/** Norwegian Bokmål (norsk bokmål) */
-$specialPageAliases['nb'] = array(
- 'ApprovedRevs' => array( 'Godkjente_revisjoner' ),
-);
+$specialPageAliases['nb'] = [
+ 'ApprovedRevs' => [ 'Godkjente_revisjoner' ],
+];
/** Low Saxon (Netherlands) (Nedersaksies) */
-$specialPageAliases['nds-nl'] = array(
- 'ApprovedRevs' => array( 'Goedekeurden_ziejen' ),
-);
+$specialPageAliases['nds-nl'] = [
+ 'ApprovedRevs' => [ 'Goedekeurden_ziejen' ],
+];
/** Dutch (Nederlands) */
-$specialPageAliases['nl'] = array(
- 'ApprovedRevs' => array( 'GoedgekeurdePaginas', 'GoedgekeurdePagina\'s'
),
-);
+$specialPageAliases['nl'] = [
+ 'ApprovedRevs' => [ 'GoedgekeurdePaginas', 'GoedgekeurdePagina\'s' ],
+];
/** Brazilian Portuguese (português do Brasil) */
-$specialPageAliases['pt-br'] = array(
- 'ApprovedRevs' => array( 'Revisões_aprovadas', 'Páginas_aprovadas',
'Páginas_desaprovadas' ),
-);
+$specialPageAliases['pt-br'] = [
+ 'ApprovedRevs' => [ 'Revisões_aprovadas', 'Páginas_aprovadas',
'Páginas_desaprovadas' ],
+];
/** Sanskrit (संस्कृतम्) */
-$specialPageAliases['sa'] = array(
- 'ApprovedRevs' => array( 'अंगीकृत_पृष्टानि' ),
-);
+$specialPageAliases['sa'] = [
+ 'ApprovedRevs' => [ 'अंगीकृत_पृष्टानि' ],
+];
/** Sicilian (sicilianu) */
-$specialPageAliases['scn'] = array(
- 'ApprovedRevs' => array( 'RevisioniApprovate' ),
-);
+$specialPageAliases['scn'] = [
+ 'ApprovedRevs' => [ 'RevisioniApprovate' ],
+];
/** Tagalog (Tagalog) */
-$specialPageAliases['tl'] = array(
- 'ApprovedRevs' => array( 'Pinayagang_mga_Rebisyon' ),
-);
+$specialPageAliases['tl'] = [
+ 'ApprovedRevs' => [ 'Pinayagang_mga_Rebisyon' ],
+];
/** Turkish (Türkçe) */
-$specialPageAliases['tr'] = array(
- 'ApprovedRevs' => array( 'OnaylanmışRevizyonlar', 'OnaylanmışSayfalar',
'OnaylanmamışSayfalar' ),
-);
+$specialPageAliases['tr'] = [
+ 'ApprovedRevs' => [ 'OnaylanmışRevizyonlar', 'OnaylanmışSayfalar',
'OnaylanmamışSayfalar' ],
+];
/** Vietnamese (Tiếng Việt) */
-$specialPageAliases['vi'] = array(
- 'ApprovedRevs' => array( 'Phiên_bản_chấp_nhận', 'Trang_chấp_nhận' ),
-);
+$specialPageAliases['vi'] = [
+ 'ApprovedRevs' => [ 'Phiên_bản_chấp_nhận', 'Trang_chấp_nhận' ],
+];
/** Simplified Chinese (中文（简体）) */
-$specialPageAliases['zh-hans'] = array(
- 'ApprovedRevs' => array( '已认可版本', '已认可页面', '未认可页面' ),
-);
+$specialPageAliases['zh-hans'] = [
+ 'ApprovedRevs' => [ '已认可版本', '已认可页面', '未认可页面' ],
+];
/** Traditional Chinese (中文（繁體）) */
-$specialPageAliases['zh-hant'] = array(
- 'ApprovedRevs' => array( '已通過修訂', '已通過頁面', '未通過頁面' ),
-);
\ No newline at end of file
+$specialPageAliases['zh-hant'] = [
+ 'ApprovedRevs' => [ '已通過修訂', '已通過頁面', '未通過頁面' ],
+];
\ No newline at end of file
diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php
index e417d2d..7b357f0 100644
--- a/ApprovedRevs.hooks.php
+++ b/ApprovedRevs.hooks.php
@@ -1,5 +1,7 @@
<?php
+use MediaWiki\MediaWikiServices;
+
/**
* Functions for the Approved Revs extension called by hooks in the MediaWiki
* code.
@@ -269,7 +271,7 @@
$unhide = $article->getContext()->getRequest()->getInt(
'unhide' ) == 1;
// Cascade unhide param in links for easy deletion browsing.
- $extraParams = array();
+ $extraParams = [];
if ( $unhide ) {
$extraParams['unhide'] = 1;
}
@@ -306,95 +308,96 @@
$tdtime, $revision->getUser() )->parse() . "</div>" );
// Created for Approved Revs
- $latestLinkParams = array();
+ $latestLinkParams = [];
if ( $latestID != $approvedID ) {
$latestLinkParams['oldid'] = $latestID;
}
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
$lnk = $current
? wfMessage( 'currentrevisionlink' )->escaped()
- : Linker::linkKnown(
+ : $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'currentrevisionlink' )->escaped(),
- array(),
+ wfMessage( 'currentrevisionlink' )->text(),
+ [],
$latestLinkParams + $extraParams
);
$curdiff = $current
? wfMessage( 'diff' )->escaped()
- : Linker::linkKnown(
+ : $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'diff' )->escaped(),
- array(),
- array(
+ wfMessage( 'diff' )->text(),
+ [],
+ [
'diff' => 'cur',
'oldid' => $revisionID
- ) + $extraParams
+ ] + $extraParams
);
$prev = $title->getPreviousRevisionID( $revisionID );
$prevlink = $prev
- ? Linker::linkKnown(
+ ? $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'previousrevision' )->escaped(),
- array(),
- array(
+ wfMessage( 'previousrevision' )->text(),
+ [],
+ [
'direction' => 'prev',
'oldid' => $revisionID
- ) + $extraParams
+ ] + $extraParams
)
: wfMessage( 'previousrevision' )->escaped();
$prevdiff = $prev
- ? Linker::linkKnown(
+ ? $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'diff' )->escaped(),
- array(),
- array(
+ wfMessage( 'diff' )->text(),
+ [],
+ [
'diff' => 'prev',
'oldid' => $revisionID
- ) + $extraParams
+ ] + $extraParams
)
: wfMessage( 'diff' )->escaped();
$nextlink = $current
? wfMessage( 'nextrevision' )->escaped()
- : Linker::linkKnown(
+ : $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'nextrevision' )->escaped(),
- array(),
- array(
+ wfMessage( 'nextrevision' )->text(),
+ [],
+ [
'direction' => 'next',
'oldid' => $revisionID
- ) + $extraParams
+ ] + $extraParams
);
$nextdiff = $current
? wfMessage( 'diff' )->escaped()
- : Linker::linkKnown(
+ : $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'diff' )->escaped(),
- array(),
- array(
+ wfMessage( 'diff' )->text(),
+ [],
+ [
'diff' => 'next',
'oldid' => $revisionID
- ) + $extraParams
+ ] + $extraParams
);
// Added for Approved Revs
$approved = ( $approvedID != null && $revisionID == $approvedID
);
$approvedlink = $approved
? wfMessage( 'approvedrevs-approvedrevision'
)->escaped()
- : Linker::linkKnown(
+ : $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'approvedrevs-approvedrevision'
)->escaped(),
- array(),
+ wfMessage( 'approvedrevs-approvedrevision'
)->text(),
+ [],
$extraParams
);
$approveddiff = $approved
? wfMessage( 'diff' )->escaped()
- : Linker::linkKnown(
+ : $linkRenderer->makeKnownLink(
$title,
- wfMessage( 'diff' )->escaped(),
- array(),
- array(
+ wfMessage( 'diff' )->text(),
+ [],
+ [
'diff' => $approvedID,
'oldid' => $revisionID
- ) + $extraParams
+ ] + $extraParams
);
$cdel = Linker::getRevDeleteLink( $user, $revision, $title );
@@ -445,23 +448,22 @@
if ( $revisionID == $article->getLatest() ) {
$text = Xml::element(
'span',
- array( 'class' => 'approvedAndLatestMsg' ),
+ [ 'class' => 'approvedAndLatestMsg' ],
wfMessage( 'approvedrevs-approvedandlatest'
)->text()
);
} else {
$text = wfMessage( 'approvedrevs-notlatest' )->parse();
- $text .= ' ' . Linker::link(
+ $text .= ' ' . $linkRenderer->makeKnownLink(
$title,
wfMessage( 'approvedrevs-viewlatestrev'
)->parse(),
- array(),
- array( 'oldid' => $article->getLatest() ),
- array( 'known', 'noclasses' )
+ [],
+ [ 'oldid' => $article->getLatest() ]
);
$text = Xml::tags(
'span',
- array( 'class' => 'notLatestMsg' ),
+ [ 'class' => 'notLatestMsg' ],
$text
);
}
@@ -513,7 +515,7 @@
if ( ! empty( $approvedRevID ) && $approvedRevID !=
$latestRevID ) {
ApprovedRevs::addCSS();
$preFormHTML .= Xml::element ( 'p',
- array( 'style' => 'font-weight: bold' ),
+ [ 'style' => 'font-weight: bold' ],
wfMessage( 'approvedrevs-editwarning' )->text()
) . "\n";
}
return true;
@@ -537,10 +539,10 @@
// is 'edit' or 'view source', but the "action" is
// different
if ( array_key_exists( 'edit', $contentActions ) ) {
- $contentActions['edit']['href'] =
$title->getLocalUrl( array( 'action' => 'edit' ) );
+ $contentActions['edit']['href'] =
$title->getLocalUrl( [ 'action' => 'edit' ] );
}
if ( array_key_exists( 'viewsource', $contentActions )
) {
- $contentActions['viewsource']['href'] =
$title->getLocalUrl( array( 'action' => 'edit' ) );
+ $contentActions['viewsource']['href'] =
$title->getLocalUrl( [ 'action' => 'edit' ] );
}
}
return true;
@@ -594,18 +596,18 @@
if ( ApprovedRevs::userCanApprove( $title ) ) {
if ( $row->rev_id == $approvedRevID ) {
$url = $title->getLocalUrl(
- array( 'action' => 'unapprove' )
+ [ 'action' => 'unapprove' ]
);
$msg = wfMessage( 'approvedrevs-unapprove'
)->text();
} else {
$url = $title->getLocalUrl(
- array( 'action' => 'approve', 'oldid'
=> $row->rev_id )
+ [ 'action' => 'approve', 'oldid' =>
$row->rev_id ]
);
$msg = wfMessage( 'approvedrevs-approve'
)->text();
}
$s .= ' (' . Xml::element(
'a',
- array( 'href' => $url ),
+ [ 'href' => $url ],
$msg
) . ')';
}
@@ -640,12 +642,12 @@
global $wgOut;
$wgOut->addHTML( "\t\t" . Xml::element(
'div',
- array( 'class' => 'successbox' ),
+ [ 'class' => 'successbox' ],
wfMessage( 'approvedrevs-approvesuccess' )->text()
) . "\n" );
$wgOut->addHTML( "\t\t" . Xml::element(
'p',
- array( 'style' => 'clear: both' )
+ [ 'style' => 'clear: both' ]
) . "\n" );
// Seems to be needed when the latest version is approved -
@@ -688,12 +690,12 @@
global $wgOut;
$wgOut->addHTML( "\t\t" . Xml::element(
'div',
- array( 'class' => 'successbox' ),
+ [ 'class' => 'successbox' ],
$successMsg
) . "\n" );
$wgOut->addHTML( "\t\t" . Xml::element(
'p',
- array( 'style' => 'clear: both' )
+ [ 'style' => 'clear: both' ]
) . "\n" );
// show the revision, instead of the history page
@@ -767,11 +769,11 @@
if ( $updater === null ) {
global $wgExtNewTables, $wgDBtype;
//if ( $wgDBtype == 'mysql' ) {
- $wgExtNewTables[] = array( 'approved_revs',
"$dir/ApprovedRevs.sql" );
+ $wgExtNewTables[] = [ 'approved_revs',
"$dir/ApprovedRevs.sql" ];
//}
} else {
//if ( $updater->getDB()->getType() == 'mysql' ) {
- $updater->addExtensionUpdate( array(
'addTable', 'approved_revs', "$dir/ApprovedRevs.sql", true ) );
+ $updater->addExtensionUpdate( [ 'addTable',
'approved_revs', "$dir/ApprovedRevs.sql", true ] );
//}
}
return true;
@@ -840,14 +842,14 @@
// at all? Aren't the "approve this revision"
// links in the history page always good
// enough?
- $wgOut->addHTML( Xml::tags( 'span', array( 'id'
=> 'contentSub2' ),
+ $wgOut->addHTML( Xml::tags( 'span', [ 'id' =>
'contentSub2' ],
Xml::element( 'a',
- array( 'href' => $title->getLocalUrl(
- array(
+ [ 'href' => $title->getLocalUrl(
+ [
'action' => 'approve',
'oldid' =>
$wgRequest->getInt( 'oldid' )
- )
- ) ),
+ ]
+ ) ],
wfMessage(
'approvedrevs-approvethisrev' )->text()
) ) );
}
@@ -855,11 +857,11 @@
$wgOut->addSubtitle(
htmlspecialchars( wfMessage(
'approvedrevs-blankpageshown' )->text() ) . ' ' .
Xml::element( 'a',
- array( 'href' => $title->getLocalUrl(
- array(
+ [ 'href' => $title->getLocalUrl(
+ [
'oldid' =>
$article->getRevIdFetched()
- )
- ) ),
+ ]
+ ) ],
wfMessage( 'approvedrevs-viewlatestrev'
)->text()
)
);
diff --git a/ApprovedRevs.i18n.magic.php b/ApprovedRevs.i18n.magic.php
index 20a9ecc..12e03fb 100644
--- a/ApprovedRevs.i18n.magic.php
+++ b/ApprovedRevs.i18n.magic.php
@@ -3,9 +3,9 @@
* Magic words for extension.
*/
-$magicWords = array();
+$magicWords = [];
/** English (English) */
-$magicWords['en'] = array(
- 'MAG_APPROVEDREVS' => array( 0, '__APPROVEDREVS__' ),
-);
+$magicWords['en'] = [
+ 'MAG_APPROVEDREVS' => [ 0, '__APPROVEDREVS__' ],
+];
diff --git a/ApprovedRevs.i18n.php b/ApprovedRevs.i18n.php
index 4578444..0d121dc 100644
--- a/ApprovedRevs.i18n.php
+++ b/ApprovedRevs.i18n.php
@@ -10,10 +10,10 @@
*
* This shim maintains compatibility back to MediaWiki 1.17.
*/
-$messages = array();
+$messages = [];
if ( !function_exists( 'wfJsonI18nShim823c3b92006b1243' ) ) {
function wfJsonI18nShim823c3b92006b1243( $cache, $code, &$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ $codeSequence = array_merge( [ $code ],
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
$fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
diff --git a/ApprovedRevs.php b/ApprovedRevs.php
index 58fbc36..305b8d3 100644
--- a/ApprovedRevs.php
+++ b/ApprovedRevs.php
@@ -12,19 +12,19 @@
define( 'APPROVED_REVS_VERSION', '0.7.3-alpha' );
// credits
-$wgExtensionCredits['other'][] = array(
+$wgExtensionCredits['other'][] = [
'path' => __FILE__,
'name' => 'Approved Revs',
'version' => APPROVED_REVS_VERSION,
- 'author' => array( 'Yaron Koren', '...' ),
+ 'author' => [ 'Yaron Koren', '...' ],
'url' =>
'https://www.mediawiki.org/wiki/Extension:Approved_Revs',
'descriptionmsg' => 'approvedrevs-desc'
-);
+];
// global variables
$egApprovedRevsIP = dirname( __FILE__ ) . '/';
-$egApprovedRevsNamespaces = array( NS_MAIN, NS_USER, NS_PROJECT, NS_TEMPLATE,
NS_HELP );
-$egApprovedRevsSelfOwnedNamespaces = array();
+$egApprovedRevsNamespaces = [ NS_MAIN, NS_USER, NS_PROJECT, NS_TEMPLATE,
NS_HELP ];
+$egApprovedRevsSelfOwnedNamespaces = [];
$egApprovedRevsBlankIfUnapproved = false;
$egApprovedRevsAutomaticApprovals = true;
$egApprovedRevsShowApproveLatest = false;
@@ -88,9 +88,9 @@
$wgGroupPermissions['*']['viewlinktolatest'] = true;
// ResourceLoader modules
-$wgResourceModules['ext.ApprovedRevs'] = array(
+$wgResourceModules['ext.ApprovedRevs'] = [
'styles' => 'ApprovedRevs.css',
'localBasePath' => __DIR__,
'remoteExtPath' => 'ApprovedRevs',
'position' => 'bottom'
-);
+];
diff --git a/ApprovedRevs_body.php b/ApprovedRevs_body.php
index 60ed528..7317fd7 100644
--- a/ApprovedRevs_body.php
+++ b/ApprovedRevs_body.php
@@ -11,8 +11,8 @@
class ApprovedRevs {
// Static arrays to prevent querying the database more than necessary.
- static $mApprovedContentForPage = array();
- static $mApprovedRevIDForPage = array();
+ static $mApprovedContentForPage = [];
+ static $mApprovedRevIDForPage = [];
static $mUserCanApprove = null;
/**
@@ -30,7 +30,7 @@
}
$dbr = wfGetDB( DB_SLAVE );
- $revID = $dbr->selectField( 'approved_revs', 'rev_id', array(
'page_id' => $pageID ) );
+ $revID = $dbr->selectField( 'approved_revs', 'rev_id', [
'page_id' => $pageID ] );
self::$mApprovedRevIDForPage[$pageID] = $revID;
return $revID;
}
@@ -118,7 +118,7 @@
}
// Allow custom setting of whether the page is approvable.
- if ( !Hooks::run( 'ApprovedRevsPageIsApprovable', array(
$title, &$isApprovable ) ) ) {
+ if ( !Hooks::run( 'ApprovedRevsPageIsApprovable', [ $title,
&$isApprovable ] ) ) {
$title->isApprovable = $isApprovable;
return $title->isApprovable;
}
@@ -136,11 +136,11 @@
// query on the page_props table.
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'page_props', 'COUNT(*)',
- array(
+ [
'pp_page' => $title->getArticleID(),
'pp_propname' => 'approvedrevs',
'pp_value' => 'y'
- )
+ ]
);
$row = $dbr->fetchRow( $res );
$isApprovable = ( $row[0] == '1' );
@@ -185,12 +185,12 @@
// query - is there an easier way?
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow(
- array( 'revision', 'page' ),
+ [ 'revision', 'page' ],
'revision.rev_user_text',
- array( 'page.page_title' =>
$title->getDBkey() ),
+ [ 'page.page_title' =>
$title->getDBkey() ],
null,
- array( 'ORDER BY' =>
'revision.rev_id ASC' ),
- array( 'revision' => array(
'JOIN', 'revision.rev_page = page.page_id' ) )
+ [ 'ORDER BY' =>
'revision.rev_id ASC' ],
+ [ 'revision' => [ 'JOIN',
'revision.rev_page = page.page_id' ] ]
);
if ( $row->rev_user_text ==
$wgUser->getName() ) {
self::$mUserCanApprove = true;
@@ -206,11 +206,11 @@
public static function saveApprovedRevIDInDB( $title, $rev_id ) {
$dbr = wfGetDB( DB_MASTER );
$page_id = $title->getArticleID();
- $old_rev_id = $dbr->selectField( 'approved_revs', 'rev_id',
array( 'page_id' => $page_id ) );
+ $old_rev_id = $dbr->selectField( 'approved_revs', 'rev_id', [
'page_id' => $page_id ] );
if ( $old_rev_id ) {
- $dbr->update( 'approved_revs', array( 'rev_id' =>
$rev_id ), array( 'page_id' => $page_id ) );
+ $dbr->update( 'approved_revs', [ 'rev_id' => $rev_id ],
[ 'page_id' => $page_id ] );
} else {
- $dbr->insert( 'approved_revs', array( 'page_id' =>
$page_id, 'rev_id' => $rev_id ) );
+ $dbr->insert( 'approved_revs', [ 'page_id' => $page_id,
'rev_id' => $rev_id ] );
}
// Update "cache" in memory
self::$mApprovedRevIDForPage[$page_id] = $rev_id;
@@ -243,13 +243,13 @@
}
$log = new LogPage( 'approval' );
- $rev_url = $title->getFullURL( array( 'oldid' => $rev_id ) );
+ $rev_url = $title->getFullURL( [ 'oldid' => $rev_id ] );
$rev_link = Xml::element(
'a',
- array( 'href' => $rev_url ),
+ [ 'href' => $rev_url ],
$rev_id
);
- $logParams = array( $rev_link );
+ $logParams = [ $rev_link ];
$log->addEntry(
'approve',
$title,
@@ -257,13 +257,13 @@
$logParams
);
- Hooks::run( 'ApprovedRevsRevisionApproved', array( $parser,
$title, $rev_id ) );
+ Hooks::run( 'ApprovedRevsRevisionApproved', [ $parser, $title,
$rev_id )] );
}
public static function deleteRevisionApproval( $title ) {
$dbr = wfGetDB( DB_MASTER );
$page_id = $title->getArticleID();
- $dbr->delete( 'approved_revs', array( 'page_id' => $page_id ) );
+ $dbr->delete( 'approved_revs', [ 'page_id' => $page_id ] );
}
/**
@@ -297,7 +297,7 @@
''
);
- Hooks::run( 'ApprovedRevsRevisionUnapproved', array( $parser,
$title ) );
+ Hooks::run( 'ApprovedRevsRevisionUnapproved', [ $parser, $title
] );
}
public static function addCSS() {
diff --git a/SpecialApprovedRevsPage.php b/SpecialApprovedRevsPage.php
index 7ffaec3..c367651 100644
--- a/SpecialApprovedRevsPage.php
+++ b/SpecialApprovedRevsPage.php
@@ -38,7 +38,7 @@
);
} else {
$navLine .= Xml::element( 'a',
- array( 'href' =>
$approvedPagesTitle->getLocalURL() ),
+ [ 'href' => $approvedPagesTitle->getLocalURL()
],
wfMessage( 'approvedrevs-approvedpages'
)->text()
);
}
@@ -52,7 +52,7 @@
);
} else {
$navLine .= Xml::element( 'a',
- array( 'href' =>
$approvedPagesTitle->getLocalURL( array( 'show' => 'notlatest' ) ) ),
+ [ 'href' => $approvedPagesTitle->getLocalURL( [
'show' => 'notlatest' ] ) ],
wfMessage( 'approvedrevs-notlatestpages'
)->text()
);
}
@@ -66,7 +66,7 @@
);
} else {
$navLine .= Xml::element( 'a',
- array( 'href' =>
$approvedPagesTitle->getLocalURL( array( 'show' => 'unapproved' ) ) ),
+ [ 'href' => $approvedPagesTitle->getLocalURL( [
'show' => 'unapproved' ] ) ],
wfMessage( 'approvedrevs-unapprovedpages'
)->text()
);
}
@@ -78,7 +78,7 @@
* Set parameters for standard navigation links.
*/
function linkParameters() {
- $params = array();
+ $params = [];
if ( $this->mMode == 'notlatest' ) {
$params['show'] = 'notlatest';
@@ -110,70 +110,70 @@
}
if ( $this->mMode == 'notlatest' ) {
- return array(
- 'tables' => array(
+ return [
+ 'tables' => [
'ar' => 'approved_revs',
'p' => 'page',
'pp' => 'page_props',
- ),
- 'fields' => array(
+ ],
+ 'fields' => [
'p.page_id AS id',
'ar.rev_id AS rev_id',
'p.page_latest AS latest_id',
- ),
- 'join_conds' => array(
- 'p' => array(
+ ],
+ 'join_conds' => [
+ 'p' => [
'JOIN', 'ar.page_id=p.page_id'
- ),
- 'pp' => array(
+ ],
+ 'pp' => [
'LEFT OUTER JOIN',
'ar.page_id=pp_page'
- ),
- ),
+ ],
+ ],
'conds' => "p.page_latest != ar.rev_id AND (
$mainCondsString )"
- );
+ ];
} elseif ( $this->mMode == 'unapproved' ) {
- return array(
- 'tables' => array(
+ return [
+ 'tables' => [
'ar' => 'approved_revs',
'p' => 'page',
'pp' => 'page_props',
- ),
- 'fields' => array(
+ ],
+ 'fields' => [
'p.page_id AS id',
'p.page_latest AS latest_id'
- ),
- 'join_conds' => array(
- 'ar' => array(
+ ],
+ 'join_conds' => [
+ 'ar' => [
'LEFT OUTER JOIN',
'p.page_id=ar.page_id'
- ),
- 'pp' => array(
+ ],
+ 'pp' => [
'LEFT OUTER JOIN',
'ar.page_id=pp_page'
- ),
- ),
+ ],
+ ],
'conds' => "ar.page_id IS NULL AND (
$mainCondsString )"
- );
+ ];
} else { // all approved pages
- return array(
- 'tables' => array(
+ return [
+ 'tables' => [
'ar' => 'approved_revs',
'p' => 'page',
'pp' => 'page_props',
- ),
- 'fields' => array(
+ ],
+ 'fields' => [
'p.page_id AS id',
'ar.rev_id AS rev_id',
'p.page_latest AS latest_id',
- ),
- 'join_conds' => array(
- 'p' => array(
+ ],
+ 'join_conds' => [
+ 'p' => [
'JOIN', 'ar.page_id=p.page_id',
- ),
- 'pp' => array(
+ ],
+ 'pp' => [
'LEFT OUTER JOIN',
'ar.page_id=pp_page'
- ),
- ),
+ ],
+ ],
'conds' => $mainCondsString
- );
+ ];
}
}
@@ -182,7 +182,7 @@
}
function getOrderFields() {
- return array( 'p.page_namespace', 'p.page_title' );
+ return [ 'p.page_namespace', 'p.page_title' ];
}
function sortDescending() {
@@ -196,6 +196,7 @@
return false;
}
+ $linkRenderer = $this->getLinkRenderer();
$pageLink = Linker::link( $title );
if ( $this->mMode == 'unapproved' ) {
@@ -205,12 +206,12 @@
if ( $egApprovedRevsShowApproveLatest &&
$title->userCan( 'approverevisions' ) ) {
$line .= ' (' . Xml::element( 'a',
- array( 'href' => $title->getLocalUrl(
- array(
+ [ 'href' => $title->getLocalUrl(
+ [
'action' => 'approve',
'oldid' =>
$result->latest_id
- )
- ) ),
+ ]
+ ) ],
wfMessage( 'approvedrevs-approvelatest'
)->text()
) . ')';
}
@@ -218,12 +219,12 @@
return $line;
} elseif ( $this->mMode == 'notlatest' ) {
$diffLink = Xml::element( 'a',
- array( 'href' => $title->getLocalUrl(
- array(
+ [ 'href' => $title->getLocalUrl(
+ [
'diff' => $result->latest_id,
'oldid' => $result->rev_id
- )
- ) ),
+ ]
+ ) ],
wfMessage( 'approvedrevs-difffromlatest'
)->text()
);
diff --git a/maintenance/approveAllPages.php b/maintenance/approveAllPages.php
index d9e1502..173bb96 100644
--- a/maintenance/approveAllPages.php
+++ b/maintenance/approveAllPages.php
@@ -58,10 +58,10 @@
$pages = $dbr->select(
'page',
- array(
+ [
'page_id',
'page_latest'
- )
+ ]
);
while ( $page = $pages->fetchObject() ) {
--
To view, visit https://gerrit.wikimedia.org/r/326384
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a79a40f7da4b08e70bb3196da5a623a788572e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: MtDu <justin.d...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
