From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 19 Feb 2010 01:25:57 +0000 (+0000)
Subject: Stylize on Api
X-Git-Tag: 1.31.0-rc.0~37705
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=59e656c23bec9e439cbf4d15f654009282642646;p=lhc%2Fweb%2Fwiklou.git

Stylize on Api

Manual layout improvements in ApiFeedWatchlist
---

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 40f487fc37..dfff301bae 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -79,7 +79,7 @@ class ApiDelete extends ApiBase {
 			
 			if ( count( $retval ) )
 				$this->dieUsageMsg( reset( $retval ) ); // We don't care about multiple errors, just report one of them
-				
+
 			if ( $params['watch'] || $wgUser->getOption( 'watchdeletion' ) )
 				$articleObj->doWatch();
 			else if ( $params['unwatch'] )
diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php
index a96fc31e47..2fd2d7491b 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -75,13 +75,17 @@ class ApiFeedWatchlist extends ApiBase {
 				'wllimit' => ( 50 > $wgFeedLimit ) ? $wgFeedLimit : 50
 			);
 
-			if ( !is_null( $params['wlowner'] ) )
+			if ( !is_null( $params['wlowner'] ) ) {
 				$fauxReqArr['wlowner'] = $params['wlowner'];
-			if ( !is_null( $params['wltoken'] ) )
+			}
+			if ( !is_null( $params['wltoken'] ) ) {
 				$fauxReqArr['wltoken'] = $params['wltoken'];
+			}
 
 			// Check for 'allrev' parameter, and if found, show all revisions to each page on wl.
-			if ( ! is_null ( $params['allrev'] ) )  $fauxReqArr['wlallrev'] = '';
+			if ( !is_null ( $params['allrev'] ) ) {
+				$fauxReqArr['wlallrev'] = '';
+			}
 
 			// Create the request
 			$fauxReq = new FauxRequest ( $fauxReqArr );
@@ -93,7 +97,7 @@ class ApiFeedWatchlist extends ApiBase {
 			// Get data array
 			$data = $module->getResultData();
 
-			$feedItems = array ();
+			$feedItems = array();
 			foreach ( (array)$data['query']['watchlist'] as $info ) {
 				$feedItems[] = $this->createFeedItem( $info );
 			}
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 7add216e66..4d5e45562c 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -414,7 +414,7 @@ class ApiMain extends ApiBase {
 
 		$moduleParams = $module->extractRequestParams();
 		
-		//Die if token required, but not provided (unless there is a gettoken parameter)
+		// Die if token required, but not provided (unless there is a gettoken parameter)
 		$salt = $module->getTokenSalt();
 		if ( $salt !== false )
 		{
diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index bf44976379..377fd74aa3 100644
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -39,7 +39,7 @@ class ApiUserrights extends ApiBase {
 	public function execute() {
 		$params = $this->extractRequestParams();
 		
-		//User already validated in call to getTokenSalt from Main
+		// User already validated in call to getTokenSalt from Main
 		$form = new UserrightsPage;
 		$user = $form->fetchUser( $params['user'] );