dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf9a35e
)
re r64962 clean up the logic for watchlist a little
author
Mark A. Hershberger
<mah@users.mediawiki.org>
Mon, 12 Apr 2010 20:15:04 +0000
(20:15 +0000)
committer
Mark A. Hershberger
<mah@users.mediawiki.org>
Mon, 12 Apr 2010 20:15:04 +0000
(20:15 +0000)
includes/api/ApiMove.php
patch
|
blob
|
history
diff --git
a/includes/api/ApiMove.php
b/includes/api/ApiMove.php
index
2752448
..
e59855b
100644
(file)
--- a/
includes/api/ApiMove.php
+++ b/
includes/api/ApiMove.php
@@
-122,11
+122,10
@@
class ApiMove extends ApiBase {
}
}
- $watch = $params['watchlist'];
- if ( $wgUser->getOption( 'watchmoves' ) ) {
- $watch = 'watch';
- }
- if ( $params['watch'] ) {
+ $watch = "preferences";
+ if ( isset( $params['watchlist'] ) ) {
+ $watch = $params['watchlist'];
+ } elseif ( $wgUser->getOption( 'watchmoves' ) || $params['watch'] ) {
$watch = 'watch';
} elseif ( $params['unwatch'] ) {
$watch = 'unwatch';