From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 28 Jul 2010 11:52:48 +0200
Subject: update to MediaWiki 1.16.0

---
 includes/api/ApiWatch.php | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

(limited to 'includes/api/ApiWatch.php')

diff --git a/includes/api/ApiWatch.php b/includes/api/ApiWatch.php
index 7901b6ac..391d91e2 100644
--- a/includes/api/ApiWatch.php
+++ b/includes/api/ApiWatch.php
@@ -23,9 +23,9 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-if (!defined('MEDIAWIKI')) {
+if ( !defined( 'MEDIAWIKI' ) ) {
 	// Eclipse helper - will be ignored in production
-	require_once ('ApiBase.php');
+	require_once ( 'ApiBase.php' );
 }
 
 /**
@@ -35,21 +35,25 @@ if (!defined('MEDIAWIKI')) {
  */
 class ApiWatch extends ApiBase {
 
-	public function __construct($main, $action) {
-		parent :: __construct($main, $action);
+	public function __construct( $main, $action ) {
+		parent :: __construct( $main, $action );
 	}
 
 	public function execute() {
 		global $wgUser;
-		if(!$wgUser->isLoggedIn())
-			$this->dieUsage('You must be logged-in to have a watchlist', 'notloggedin');
+		if ( !$wgUser->isLoggedIn() )
+			$this->dieUsage( 'You must be logged-in to have a watchlist', 'notloggedin' );
+
 		$params = $this->extractRequestParams();
-		$title = Title::newFromText($params['title']);
-		if(!$title)
-			$this->dieUsageMsg(array('invalidtitle', $params['title']));
-		$article = new Article($title);
-		$res = array('title' => $title->getPrefixedText());
-		if($params['unwatch'])
+		$title = Title::newFromText( $params['title'] );
+
+		if ( !$title )
+			$this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
+
+		$article = new Article( $title );
+		$res = array( 'title' => $title->getPrefixedText() );
+
+		if ( $params['unwatch'] )
 		{
 			$res['unwatched'] = '';
 			$success = $article->doUnwatch();
@@ -59,14 +63,14 @@ class ApiWatch extends ApiBase {
 			$res['watched'] = '';
 			$success = $article->doWatch();
 		}
-		if(!$success)
-			$this->dieUsageMsg(array('hookaborted'));
-		$this->getResult()->addValue(null, $this->getModuleName(), $res);
+		if ( !$success )
+			$this->dieUsageMsg( array( 'hookaborted' ) );
+		$this->getResult()->addValue( null, $this->getModuleName(), $res );
 	}
 
 	public function isWriteMode() {
 		return true;
-	} 
+	}
 
 	public function getAllowedParams() {
 		return array (
@@ -87,6 +91,14 @@ class ApiWatch extends ApiBase {
 			'Add or remove a page from/to the current user\'s watchlist'
 		);
 	}
+	
+	public function getPossibleErrors() {
+		return array_merge( parent::getPossibleErrors(), array(
+			array( 'code' => 'notloggedin', 'info' => 'You must be logged-in to have a watchlist' ),
+			array( 'invalidtitle', 'title' ),
+			array( 'hookaborted' ),
+		) );
+	}
 
 	protected function getExamples() {
 		return array(
@@ -96,6 +108,6 @@ class ApiWatch extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiWatch.php 69579 2010-07-20 02:49:55Z tstarling $';
+		return __CLASS__ . ': $Id: ApiWatch.php 69578 2010-07-20 02:46:20Z tstarling $';
 	}
 }
-- 
cgit v1.2.2