From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 9 Feb 2012 01:06:57 +0000 (+0000)
Subject: Documentation and whitespace
X-Git-Tag: 1.31.0-rc.0~24844
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=commitdiff_plain;h=b7d68a87160469e3c28b483a1895cc364978f6ad;hp=d158c30ce4d0c75d2a1bc086f34683bc92c59dde;p=lhc%2Fweb%2Fwiklou.git

Documentation and whitespace
---

diff --git a/api.php5 b/api.php5
index 504098d317..72ee155e6d 100644
--- a/api.php5
+++ b/api.php5
@@ -1 +1 @@
-<?php require 'api.php'; 
\ No newline at end of file
+<?php require 'api.php';
diff --git a/includes/Cdb_PHP.php b/includes/Cdb_PHP.php
index aaaf33a184..e1e6d28b35 100644
--- a/includes/Cdb_PHP.php
+++ b/includes/Cdb_PHP.php
@@ -51,7 +51,7 @@ class CdbFunctions {
 	/**
 	 * The CDB hash function.
 	 *
-	 * @param $s
+	 * @param $s string
 	 *
 	 * @return
 	 */
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 133339a1b3..e67ac052e3 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -523,7 +523,7 @@ abstract class ApiBase extends ContextSource {
 	 * value) or (parameter name) => (array with PARAM_* constants as keys)
 	 * Don't call this function directly: use getFinalParams() to allow
 	 * hooks to modify parameters as needed.
-	 * @return array or false
+	 * @return array|bool
 	 */
 	protected function getAllowedParams() {
 		return false;
@@ -773,7 +773,7 @@ abstract class ApiBase extends ContextSource {
 	 * Using the settings determine the value for the given parameter
 	 *
 	 * @param $paramName String: parameter name
-	 * @param $paramSettings Mixed: default value or an array of settings
+	 * @param $paramSettings array|mixed default value or an array of settings
 	 *  using PARAM_* constants.
 	 * @param $parseLimit Boolean: parse limit?
 	 * @return mixed Parameter value