jenkins-bot has submitted this change and it was merged.
Change subject: SpecialWatchlist: Minor cleanup
......................................................................
SpecialWatchlist: Minor cleanup
* Prettier whitespacing
* Removed query building special-case already handled by makeList()
Change-Id: I45aa7bbbff1e21abd739825939fd5cd3d02fc7a4
---
M includes/specials/SpecialWatchlist.php
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index 336b05b..62c33a2 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -60,15 +60,21 @@
// Add feed links
$wlToken = $user->getTokenFromOption( 'watchlisttoken' );
if ( $wlToken ) {
- $this->addFeedLinks( array( 'action' =>
'feedwatchlist', 'allrev' => 'allrev',
- 'wlowner' =>
$user->getName(), 'wltoken' => $wlToken ) );
+ $this->addFeedLinks( array(
+ 'action' => 'feedwatchlist',
+ 'allrev' => 1,
+ 'wlowner' => $user->getName(),
+ 'wltoken' => $wlToken,
+ ) );
}
$this->setHeaders();
$this->outputHeader();
- $output->addSubtitle( $this->msg( 'watchlistfor2',
$user->getName()
- )->rawParams( SpecialEditWatchlist::buildTools( null )
) );
+ $output->addSubtitle(
+ $this->msg( 'watchlistfor2', $user->getName() )
+ ->rawParams( SpecialEditWatchlist::buildTools(
null ) )
+ );
$request = $this->getRequest();
@@ -205,10 +211,6 @@
$nonRevisionTypes = array( RC_LOG );
wfRunHooks( 'SpecialWatchlistGetNonRevisionTypes',
array( &$nonRevisionTypes ) );
if ( $nonRevisionTypes ) {
- if ( count( $nonRevisionTypes ) === 1 ) {
- // if only one use an equality instead
of IN condition
- $nonRevisionTypes = reset(
$nonRevisionTypes );
- }
$conds[] = $dbr->makeList(
array(
'rc_this_oldid=page_latest',
--
To view, visit https://gerrit.wikimedia.org/r/94456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45aa7bbbff1e21abd739825939fd5cd3d02fc7a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
