jenkins-bot has submitted this change and it was merged.
Change subject: Update formatting
......................................................................
Update formatting
Change-Id: I3cbe1f5e48730fbbe57e4b20a0c202edddc93c95
---
M includes/actions/CachedAction.php
M includes/actions/CreditsAction.php
M includes/actions/DeleteAction.php
M includes/actions/EditAction.php
M includes/actions/HistoryAction.php
M includes/actions/InfoAction.php
M includes/actions/MarkpatrolledAction.php
M includes/actions/ProtectAction.php
M includes/actions/RawAction.php
M includes/actions/RenderAction.php
M includes/actions/RevertAction.php
M includes/actions/ViewAction.php
M includes/actions/WatchAction.php
13 files changed, 43 insertions(+), 30 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/CachedAction.php
b/includes/actions/CachedAction.php
index bfdda7b..f3ce25b 100644
--- a/includes/actions/CachedAction.php
+++ b/includes/actions/CachedAction.php
@@ -184,5 +184,4 @@
$this->getOutput()->setSubtitle(
$this->cacheHelper->getCachedNotice( $this->getContext() ) );
}
}
-
}
diff --git a/includes/actions/CreditsAction.php
b/includes/actions/CreditsAction.php
index 0a2bf30..cd7eb45 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -74,6 +74,7 @@
}
wfProfileOut( __METHOD__ );
+
return $s;
}
@@ -94,6 +95,7 @@
$d = '';
$t = '';
}
+
return $this->msg( 'lastmodifiedatby', $d, $t )->rawParams(
$this->userLink( $user ) )->params( $user->getName()
)->escaped();
}
@@ -175,6 +177,7 @@
}
$count = count( $fulllist );
+
# "Based on work by ..."
return $count
? $this->msg( 'othercontribs' )->rawParams(
diff --git a/includes/actions/DeleteAction.php
b/includes/actions/DeleteAction.php
index db7123d..069d570 100644
--- a/includes/actions/DeleteAction.php
+++ b/includes/actions/DeleteAction.php
@@ -43,7 +43,5 @@
public function show() {
$this->page->delete();
-
}
-
}
diff --git a/includes/actions/EditAction.php b/includes/actions/EditAction.php
index 3dd4c48..72210a9 100644
--- a/includes/actions/EditAction.php
+++ b/includes/actions/EditAction.php
@@ -49,9 +49,7 @@
$editor = new EditPage( $page );
$editor->edit();
}
-
}
-
}
/**
@@ -75,5 +73,4 @@
parent::show();
}
-
}
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index e58791e..d9eba9c 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -122,6 +122,7 @@
if ( $feedType ) {
$this->feed( $feedType );
wfProfileOut( __METHOD__ );
+
return;
}
@@ -141,6 +142,7 @@
)
);
wfProfileOut( __METHOD__ );
+
return;
}
@@ -162,7 +164,7 @@
}
if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
$checkDeleted = Xml::checkLabel( $this->msg(
'history-show-deleted' )->text(),
- 'deleted', 'mw-show-deleted-only', $request->getBool(
'deleted' ) ) . "\n";
+ 'deleted', 'mw-show-deleted-only',
$request->getBool( 'deleted' ) ) . "\n";
} else {
$checkDeleted = '';
}
@@ -316,9 +318,10 @@
$wgContLang->time( $rev->getTimestamp() )
)->inContentLanguage()->text();
} else {
$title = $rev->getUserText() .
- $this->msg( 'colon-separator'
)->inContentLanguage()->text() .
- FeedItem::stripComment( $rev->getComment() );
+ $this->msg( 'colon-separator'
)->inContentLanguage()->text() .
+ FeedItem::stripComment( $rev->getComment() );
}
+
return new FeedItem(
$title,
$text,
@@ -383,6 +386,7 @@
$this->tagFilter
);
wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this,
&$queryInfo ) );
+
return $queryInfo;
}
@@ -401,6 +405,7 @@
$s = '';
}
$this->lastRow = $row;
+
return $s;
}
@@ -457,13 +462,15 @@
$s .= $this->buttons;
$s .= '<ul id="pagehistory">' . "\n";
+
return $s;
}
private function getRevisionButton( $name, $msg ) {
$this->preventClickjacking();
# Note bug #20966, <button> is non-standard in IE<8
- $element = Html::element( 'button',
+ $element = Html::element(
+ 'button',
array(
'type' => 'submit',
'name' => $name,
@@ -502,6 +509,7 @@
$s .= $this->buttons;
}
$s .= '</form>';
+
return $s;
}
@@ -534,8 +542,7 @@
* @return String: HTML output for the row
*/
function historyLine( $row, $next, $notificationtimestamp = false,
- $latest = false, $firstInList = false )
- {
+ $latest = false, $firstInList = false ) {
$rev = new Revision( $row );
$rev->setTitle( $this->getTitle() );
@@ -550,9 +557,9 @@
$lastlink = $this->lastLink( $rev, $next );
$diffButtons = $this->diffButtons( $rev, $firstInList );
$histLinks = Html::rawElement(
- 'span',
- array( 'class' => 'mw-history-histlinks' ),
- $this->msg( 'parentheses' )->rawParams(
$curlink . $this->historyPage->message['pipe-separator'] . $lastlink
)->escaped()
+ 'span',
+ array( 'class' => 'mw-history-histlinks' ),
+ $this->msg( 'parentheses' )->rawParams( $curlink .
$this->historyPage->message['pipe-separator'] . $lastlink )->escaped()
);
$s = $histLinks . $diffButtons;
@@ -635,8 +642,8 @@
}
if ( !$rev->isDeleted( Revision::DELETED_TEXT )
- && !$prevRev->isDeleted( Revision::DELETED_TEXT
) )
- {
+ && !$prevRev->isDeleted( Revision::DELETED_TEXT
)
+ ) {
# Create undo tooltip for the first (=latest)
line only
$undoTooltip = $latest
? array( 'title' => $this->msg(
'tooltip-undo' )->text() )
@@ -705,6 +712,7 @@
if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
$link = "<span class=\"history-deleted\">$link</span>";
}
+
return $link;
}
@@ -758,8 +766,8 @@
)
);
} elseif ( !$prevRev->userCan( Revision::DELETED_TEXT,
$this->getUser() )
- || !$nextRev->userCan( Revision::DELETED_TEXT,
$this->getUser() ) )
- {
+ || !$nextRev->userCan( Revision::DELETED_TEXT,
$this->getUser() )
+ ) {
return $last;
} else {
return Linker::linkKnown(
@@ -816,6 +824,7 @@
array_merge( $radio, $checkmark, array(
'name' => 'diff',
'id' => "mw-diff-$id" ) ) );
+
return $first . $second;
} else {
return '';
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 701f6d4..c97267b 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -153,6 +153,7 @@
*/
protected function makeHeader( $header ) {
$spanAttribs = array( 'class' => 'mw-headline', 'id' =>
Sanitizer::escapeId( $header ) );
+
return Html::rawElement( 'h2', array(), Html::element( 'span',
$spanAttribs, $header ) );
}
@@ -306,7 +307,7 @@
if (
$user->isAllowed( 'unwatchedpages' ) ||
( $wgUnwatchedPageThreshold !== false &&
- $pageCounts['watchers'] >= $wgUnwatchedPageThreshold )
+ $pageCounts['watchers'] >=
$wgUnwatchedPageThreshold )
) {
// Number of page watchers
$pageInfo['header-basic'][] = array(
@@ -736,6 +737,7 @@
);
wfProfileOut( __METHOD__ );
+
return $result;
}
@@ -803,6 +805,7 @@
}
$count = count( $fulllist );
+
# "Based on work by ..."
return $count
? $this->msg( 'othercontribs' )->rawParams(
diff --git a/includes/actions/MarkpatrolledAction.php
b/includes/actions/MarkpatrolledAction.php
index ff6cf13..4016f67 100644
--- a/includes/actions/MarkpatrolledAction.php
+++ b/includes/actions/MarkpatrolledAction.php
@@ -70,6 +70,7 @@
$this->getOutput()->setPageTitle( $this->msg(
'markedaspatrollederror' ) );
$this->getOutput()->addWikiMsg(
'markedaspatrollederror-noautopatrol' );
$this->getOutput()->returnToMain( null, $return );
+
return;
}
diff --git a/includes/actions/ProtectAction.php
b/includes/actions/ProtectAction.php
index ec6648e..8b2bfaa 100644
--- a/includes/actions/ProtectAction.php
+++ b/includes/actions/ProtectAction.php
@@ -43,9 +43,7 @@
public function show() {
$this->page->protect();
-
}
-
}
/**
@@ -64,7 +62,5 @@
public function show() {
$this->page->unprotect();
-
}
-
}
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index 32751e4..1213bfb 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -212,6 +212,7 @@
$oldid = 0;
break;
}
+
return $oldid;
}
@@ -273,6 +274,7 @@
if ( $this->mOldId !== null ) {
return $this->mOldId;
}
+
return parent::getOldId();
}
}
diff --git a/includes/actions/RenderAction.php
b/includes/actions/RenderAction.php
index 3d244fb..c9b3f8f 100644
--- a/includes/actions/RenderAction.php
+++ b/includes/actions/RenderAction.php
@@ -43,7 +43,5 @@
public function show() {
$this->page->render();
-
}
-
}
diff --git a/includes/actions/RevertAction.php
b/includes/actions/RevertAction.php
index a5fc4e1..0a7ef9f 100644
--- a/includes/actions/RevertAction.php
+++ b/includes/actions/RevertAction.php
@@ -38,7 +38,8 @@
$this->getOutput()->showErrorPage( 'nosuchaction',
'nosuchactiontext' );
}
- public function execute() {}
+ public function execute() {
+ }
}
/**
@@ -63,8 +64,8 @@
$oldimage = $this->getRequest()->getText( 'oldimage' );
if ( strlen( $oldimage ) < 16
|| strpos( $oldimage, '/' ) !== false
- || strpos( $oldimage, '\\' ) !== false )
- {
+ || strpos( $oldimage, '\\' ) !== false
+ ) {
throw new ErrorPageError( 'internalerror',
'unexpected', array( 'oldimage', $oldimage ) );
}
@@ -114,6 +115,7 @@
public function onSubmit( $data ) {
$source = $this->page->getFile()->getArchiveVirtualUrl(
$this->getRequest()->getText( 'oldimage' ) );
$comment = $data['comment'];
+
// TODO: Preserve file properties from database instead of
reloading from file
return $this->page->getFile()->upload( $source, $comment,
$comment, 0, false, false, $this->getUser() );
}
@@ -139,6 +141,7 @@
protected function getDescription() {
$this->getOutput()->addBacklinkSubtitle( $this->getTitle() );
+
return '';
}
}
diff --git a/includes/actions/ViewAction.php b/includes/actions/ViewAction.php
index e227197..3a24565 100644
--- a/includes/actions/ViewAction.php
+++ b/includes/actions/ViewAction.php
@@ -43,5 +43,4 @@
public function show() {
$this->page->view();
}
-
}
diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 929c1b5..054d615 100644
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -51,6 +51,7 @@
wfProfileIn( __METHOD__ );
self::doWatch( $this->getTitle(), $this->getUser() );
wfProfileOut( __METHOD__ );
+
return true;
}
@@ -105,6 +106,7 @@
return self::doUnwatch( $title, $user );
}
}
+
return Status::newGood();
}
@@ -129,6 +131,7 @@
$user->addWatch( $title, $checkRights );
wfRunHooks( 'WatchArticleComplete', array( &$user,
&$page ) );
}
+
return $status;
}
@@ -152,6 +155,7 @@
$user->removeWatch( $title );
wfRunHooks( 'UnwatchArticleComplete', array( &$user,
&$page ) );
}
+
return $status;
}
@@ -220,6 +224,7 @@
wfProfileIn( __METHOD__ );
self::doUnwatch( $this->getTitle(), $this->getUser() );
wfProfileOut( __METHOD__ );
+
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/95345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cbe1f5e48730fbbe57e4b20a0c202edddc93c95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
