From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 14 Mar 2011 01:04:16 +0000 (+0000)
Subject: Commit last of my w/c
X-Git-Tag: 1.31.0-rc.0~31437
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=00c36af2cf064247152cee74e3270b8c19cf13a2;p=lhc%2Fweb%2Fwiklou.git

Commit last of my w/c

Documentation, braces, explicit variable definitions
---

diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php
index 0fb2e06164..0d9e349b4e 100644
--- a/includes/filerepo/ArchivedFile.php
+++ b/includes/filerepo/ArchivedFile.php
@@ -32,7 +32,8 @@ class ArchivedFile {
 		$timestamp, # time of upload
 		$dataLoaded, # Whether or not all this has been loaded from the database (loadFromXxx)
 		$deleted, # Bitfield akin to rev_deleted
-		$pageCount;
+		$pageCount,
+		$archive_name;
 
 	/**
 	 * @var MediaHandler
@@ -45,6 +46,12 @@ class ArchivedFile {
 
 	/**#@-*/
 
+	/**
+	 * @throws MWException
+	 * @param Title $title
+	 * @param int $id
+	 * @param string $key
+	 */
 	function __construct( $title, $id=0, $key='' ) {
 		$this->id = -1;
 		$this->title = false;
@@ -66,19 +73,22 @@ class ArchivedFile {
 		$this->dataLoaded = false;
 		$this->exists = false;
 
-		if( is_object($title) ) {
+		if( is_object( $title ) ) {
 			$this->title = $title;
 			$this->name = $title->getDBkey();
 		}
 
-		if ($id)
+		if ($id) {
 			$this->id = $id;
+		}
 
-		if ($key)
+		if ($key) {
 			$this->key = $key;
+		}
 
-		if (!$id && !$key && !is_object($title))
+		if ( !$id && !$key && !is_object( $title ) ) {
 			throw new MWException( "No specifications provided to ArchivedFile constructor." );
+		}
 	}
 
 	/**
@@ -91,17 +101,20 @@ class ArchivedFile {
 		}
 		$conds = array();
 
-		if( $this->id > 0 )
+		if( $this->id > 0 ) {
 			$conds['fa_id'] = $this->id;
+		}
 		if( $this->key ) {
 			$conds['fa_storage_group'] = $this->group;
 			$conds['fa_storage_key'] = $this->key;
 		}
-		if( $this->title )
+		if( $this->title ) {
 			$conds['fa_name'] = $this->title->getDBkey();
+		}
 
-		if( !count($conds))
+		if( !count($conds)) {
 			throw new MWException( "No specific information for retrieving archived file" );
+		}
 
 		if( !$this->title || $this->title->getNamespace() == NS_FILE ) {
 			$dbr = wfGetDB( DB_SLAVE );