dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dbc5631
b46ec8f
)
Merge "AJAXify watchlist editor"
author
Catrope
<roan.kattouw@gmail.com>
Wed, 1 Aug 2012 00:24:46 +0000
(
00:24
+0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 1 Aug 2012 00:24:46 +0000
(
00:24
+0000)
1
2
includes/api/ApiWatch.php
patch
|
diff1
|
diff2
|
blob
|
history
includes/specials/SpecialEditWatchlist.php
patch
|
diff1
|
diff2
|
blob
|
history
languages/messages/MessagesEn.php
patch
|
diff1
|
diff2
|
blob
|
history
languages/messages/MessagesQqq.php
patch
|
diff1
|
diff2
|
blob
|
history
maintenance/language/messages.inc
patch
|
diff1
|
diff2
|
blob
|
history
resources/Resources.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
includes/api/ApiWatch.php
index
0509f1f
,
a897cfd
..
f307f9a
---
1
/
includes/api/ApiWatch.php
---
2
/
includes/api/ApiWatch.php
+++ b/
includes/api/ApiWatch.php
@@@
-85,13
-98,13
+98,16
@@@
class ApiWatch extends ApiBase
return array(
'title' => array(
ApiBase::PARAM_TYPE => 'string',
- ApiBase::PARAM_REQUIRED => true
+ ),
+ 'titles' => array(
+ ApiBase::PARAM_TYPE => 'string',
+ ApiBase::PARAM_ISMULTI => true
),
'unwatch' => false,
- 'token' => null,
+ 'token' => array(
+ ApiBase::PARAM_TYPE => 'string',
+ ApiBase::PARAM_REQUIRED => true
+ ),
);
}
diff --cc
includes/specials/SpecialEditWatchlist.php
Simple merge
diff --cc
languages/messages/MessagesEn.php
Simple merge
diff --cc
languages/messages/MessagesQqq.php
Simple merge
diff --cc
maintenance/language/messages.inc
Simple merge
diff --cc
resources/Resources.php
Simple merge