Re-instate most of the revisions for bug 33147 "API examples should explain what...

[lhc/web/wiklou.git] / includes / api / ApiWatch.php

diff --git a/includes/api/ApiWatch.php b/includes/api/ApiWatch.php
index 13220cb..4b448d6 100644 (file)
--- a/includes/api/ApiWatch.php
+++ b/includes/api/ApiWatch.php
@@ -24,11 +24,6 @@
  * @file
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-       // Eclipse helper - will be ignored in production
-       require_once( 'ApiBase.php' );
-}
-
 /**
  * API module to allow users to watch a page
  *
@@ -41,29 +36,28 @@ class ApiWatch extends ApiBase {
        }
 
        public function execute() {
-               global $wgUser;
-               if ( !$wgUser->isLoggedIn() ) {
+               $user = $this->getUser();
+               if ( !$user->isLoggedIn() ) {
                        $this->dieUsage( 'You must be logged-in to have a watchlist', 'notloggedin' );
                }
 
                $params = $this->extractRequestParams();
                $title = Title::newFromText( $params['title'] );
 
-               if ( !$title ) {
+               if ( !$title || $title->getNamespace() < 0 ) {
                        $this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
                }
 
-               $article = new Article( $title, 0 );
                $res = array( 'title' => $title->getPrefixedText() );
 
                if ( $params['unwatch'] ) {
                        $res['unwatched'] = '';
                        $res['message'] = wfMsgExt( 'removedwatchtext', array( 'parse' ), $title->getPrefixedText() );
-                       $success = UnwatchAction::doUnwatch( $title, $wgUser );
+                       $success = UnwatchAction::doUnwatch( $title, $user );
                } else {
                        $res['watched'] = '';
                        $res['message'] = wfMsgExt( 'addedwatchtext', array( 'parse' ), $title->getPrefixedText() );
-                       $success = WatchAction::doWatch( $title, $wgUser );
+                       $success = WatchAction::doWatch( $title, $user );
                }
                if ( !$success ) {
                        $this->dieUsageMsg( 'hookaborted' );
@@ -120,13 +114,13 @@ class ApiWatch extends ApiBase {
 
        public function getExamples() {
                return array(
-                       'api.php?action=watch&title=Main_Page',
-                       'api.php?action=watch&title=Main_Page&unwatch=',
+                       'api.php?action=watch&title=Main_Page' => 'Watch the page "Main Page"',
+                       'api.php?action=watch&title=Main_Page&unwatch=' => 'Unwatch the page "Main Page"',
                );
        }
 
        public function getHelpUrls() {
-               return 'http://www.mediawiki.org/wiki/API:Watch';
+               return 'https://www.mediawiki.org/wiki/API:Watch';
        }
 
        public function getVersion() {