Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 4 insertions, 5 deletions

diff --git a/includes/upload/UploadFromFile.php b/includes/upload/UploadFromFile.php
index a00ed327..3a1e8bdc 100644
--- a/includes/upload/UploadFromFile.php
+++ b/includes/upload/UploadFromFile.php
@@ -28,14 +28,13 @@
  * @author Bryan Tong Minh
  */
 class UploadFromFile extends UploadBase {
-
 	/**
 	 * @var WebRequestUpload
 	 */
 	protected $mUpload = null;
 
 	/**
-	 * @param $request WebRequest
+	 * @param WebRequest $request
 	 */
 	function initializeFromRequest( &$request ) {
 		$upload = $request->getUpload( 'wpUploadFile' );
@@ -49,8 +48,8 @@ class UploadFromFile extends UploadBase {
 
 	/**
 	 * Initialize from a filename and a WebRequestUpload
-	 * @param $name
-	 * @param $webRequestUpload
+	 * @param string $name
+	 * @param WebRequestUpload $webRequestUpload
 	 */
 	function initialize( $name, $webRequestUpload ) {
 		$this->mUpload = $webRequestUpload;
@@ -59,7 +58,7 @@ class UploadFromFile extends UploadBase {
 	}
 
 	/**
-	 * @param $request
+	 * @param WebRequest $request
 	 * @return bool
 	 */
 	static function isValidRequest( $request ) {