Merge "Revert "AJAXify watchlist editor""

diff --cc includes/api/ApiWatch.php
index f307f9a,c923c6d..0509f1f
--- 1/includes/api/ApiWatch.php
--- 2/includes/api/ApiWatch.php
+++ b/includes/api/ApiWatch.php
@@@ -98,16 -85,10 +85,13 @@@ class ApiWatch extends ApiBase 
                return array(
                        'title' => array(
                                ApiBase::PARAM_TYPE => 'string',
-                       ),
-                       'titles' => array(
-                               ApiBase::PARAM_TYPE => 'string',
-                               ApiBase::PARAM_ISMULTI => true
+                               ApiBase::PARAM_REQUIRED => 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