update to MediaWiki 1.17.0

1 files changed, 12 insertions, 6 deletions

diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php
index ffc06303..ecc09978 100644
--- a/includes/filerepo/ArchivedFile.php
+++ b/includes/filerepo/ArchivedFile.php
@@ -1,10 +1,17 @@
 <?php
+/**
+ * Deleted file in the 'filearchive' table
+ *
+ * @file
+ * @ingroup FileRepo
+ */
 
 /**
- * @ingroup Media
+ * Class representing a row of the 'filearchive' table
+ *
+ * @ingroup FileRepo
  */
-class ArchivedFile
-{
+class ArchivedFile {
 	/**#@+
 	 * @private
 	 */
@@ -29,7 +36,7 @@ class ArchivedFile
 
 	/**#@-*/
 
-	function ArchivedFile( $title, $id=0, $key='' ) {
+	function __construct( $title, $id=0, $key='' ) {
 		$this->id = -1;
 		$this->title = false;
 		$this->name = false;
@@ -140,7 +147,6 @@ class ArchivedFile
 			$this->deleted = $row->fa_deleted;
 		} else {
 			throw new MWException( 'This title does not correspond to an image page.' );
-			return;
 		}
 		$this->dataLoaded = true;
 		$this->exists = true;
@@ -219,7 +225,7 @@ class ArchivedFile
 	 * Return the FileStore storage group
 	 */
 	public function getGroup() {
-		return $file->group;
+		return $this->group;
 	}
 
 	/**