From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 18 Nov 2013 18:28:22 +0000 (+0000)
Subject: Merge "Address errors and warnings in CodeSniffer in api/"
X-Git-Tag: 1.31.0-rc.0~18064
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=0fe5700a8a2cb8805d5e4c71fcff3e36e42807e2;p=lhc%2Fweb%2Fwiklou.git

Merge "Address errors and warnings in CodeSniffer in api/"
---

0fe5700a8a2cb8805d5e4c71fcff3e36e42807e2
diff --cc includes/api/ApiDelete.php
index fe5a196902,b9b07d149b..c09cad322b
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@@ -127,15 -133,17 +133,17 @@@ class ApiDelete extends ApiBase 
  	}
  
  	/**
 -	 * @param $page WikiPage|Page object to work on
 -	 * @param $user User doing the action
 -	 * @param $token
 -	 * @param $oldimage
 -	 * @param $reason
 -	 * @param $suppress bool
 +	 * @param Page $page Object to work on
 +	 * @param User $user User doing the action
 +	 * @param string $token Delete token (same as edit token)
 +	 * @param string $oldimage Archive name
 +	 * @param string $reason Reason for the deletion. Autogenerated if null.
 +	 * @param bool $suppress Whether to mark all deleted versions as restricted
  	 * @return Status|array
  	 */
- 	public static function deleteFile( Page $page, User $user, $token, $oldimage, &$reason = null, $suppress = false ) {
+ 	public static function deleteFile( Page $page, User $user, $token, $oldimage,
+ 		&$reason = null, $suppress = false
+ 	) {
  		$title = $page->getTitle();
  		$errors = self::getPermissionsError( $title, $user, $token );
  		if ( count( $errors ) ) {