From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 13 Jan 2012 02:30:51 +0000 (+0000)
Subject: A couple more for r108785
X-Git-Tag: 1.31.0-rc.0~25312
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=51cf68ff28d47199dab4c29791416be0212e72ba;p=lhc%2Fweb%2Fwiklou.git

A couple more for r108785

More doucmentations
---

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 099b51e9e2..7751deff63 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1115,7 +1115,7 @@ abstract class HTMLFormField {
 	/**
 	 * flatten an array of options to a single array, for instance,
 	 * a set of <options> inside <optgroups>.
-	 * @param $options Associative Array with values either Strings
+	 * @param $options array Associative Array with values either Strings
 	 *	 or Arrays
 	 * @return Array flattened input
 	 */
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 410567d33c..14168a366e 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -509,10 +509,10 @@ class Preferences {
 
 	/**
 	 * @param $user User
-	 * @param $context IContextSource
+	 * @param $context ContextSource
 	 * @param $defaultPreferences Array
 	 */
-	static function filesPreferences( $user, IContextSource $context, &$defaultPreferences ) {
+	static function filesPreferences( $user, ContextSource $context, &$defaultPreferences ) {
 		## Files #####################################
 		$defaultPreferences['imagesize'] = array(
 			'type' => 'select',
@@ -530,11 +530,11 @@ class Preferences {
 
 	/**
 	 * @param $user User
-	 * @param $context IContextSource
+	 * @param $context ContextSource
 	 * @param $defaultPreferences
 	 * @return void
 	 */
-	static function datetimePreferences( $user, IContextSource $context, &$defaultPreferences ) {
+	static function datetimePreferences( $user, ContextSource $context, &$defaultPreferences ) {
 		## Date and time #####################################
 		$dateOptions = self::getDateOptions( $context );
 		if ( $dateOptions ) {
diff --git a/includes/filerepo/file/FSFile.php b/includes/filerepo/file/FSFile.php
index 40f69c5d4d..38dfbac0b0 100644
--- a/includes/filerepo/file/FSFile.php
+++ b/includes/filerepo/file/FSFile.php
@@ -196,7 +196,7 @@ class FSFile {
 	 * Get the final file extension from a file system path
 	 * 
 	 * @param $path string
-	 * @returns string
+	 * @return string
 	 */
 	public static function extensionFromPath( $path ) {
 		$i = strrpos( $path, '.' );