r64975 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r64974‎ | r64975 | r64976 >
Date:20:15, 12 April 2010
Author:mah
Status:ok
Tags:
Comment:
re r64962 clean up the logic for watchlist a little
Modified paths:
  • /trunk/phase3/includes/api/ApiMove.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/api/ApiMove.php
@@ -122,12 +122,11 @@
123123 }
124124 }
125125
126 - $watch = $params['watchlist'];
127 - if ( $wgUser->getOption( 'watchmoves' ) ) {
 126+ $watch = "preferences";
 127+ if ( isset( $params['watchlist'] ) ) {
 128+ $watch = $params['watchlist'];
 129+ } elseif ( $wgUser->getOption( 'watchmoves' ) || $params['watch'] ) {
128130 $watch = 'watch';
129 - }
130 - if ( $params['watch'] ) {
131 - $watch = 'watch';
132131 } elseif ( $params['unwatch'] ) {
133132 $watch = 'unwatch';
134133 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r64962re r64291 and r64852 use ApiBase::setWatch instead of wgUser->*Watch to set w...mah15:44, 12 April 2010

Status & tagging log