From: IAlex Date: Sun, 10 Feb 2013 12:47:01 +0000 (+0000) Subject: Merge "fix some spacing" X-Git-Tag: 1.31.0-rc.0~20733 X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=0cce29822690ec91b861e79f632396de2d38530e;p=lhc%2Fweb%2Fwiklou.git Merge "fix some spacing" --- 0cce29822690ec91b861e79f632396de2d38530e diff --cc includes/filerepo/file/ArchivedFile.php index d6031c78bd,99b18aa8f4..3f78619758 --- a/includes/filerepo/file/ArchivedFile.php +++ b/includes/filerepo/file/ArchivedFile.php @@@ -137,12 -137,30 +137,12 @@@ class ArchivedFile if( !$this->title || $this->title->getNamespace() == NS_FILE ) { $this->dataLoaded = true; // set it here, to have also true on miss $dbr = wfGetDB( DB_SLAVE ); - $row = $dbr->selectRow( 'filearchive', - array( - 'fa_id', - 'fa_name', - 'fa_archive_name', - 'fa_storage_key', - 'fa_storage_group', - 'fa_size', - 'fa_bits', - 'fa_width', - 'fa_height', - 'fa_metadata', - 'fa_media_type', - 'fa_major_mime', - 'fa_minor_mime', - 'fa_description', - 'fa_user', - 'fa_user_text', - 'fa_timestamp', - 'fa_deleted', - 'fa_sha1' ), + $row = $dbr->selectRow( + 'filearchive', + self::selectFields(), $conds, __METHOD__, - array( 'ORDER BY' => 'fa_timestamp DESC') + array( 'ORDER BY' => 'fa_timestamp DESC' ) ); if ( !$row ) { // this revision does not exist?