Merge "fix some spacing"

diff --cc includes/ImagePage.php
Simple merge

diff --cc includes/filerepo/file/ArchivedFile.php
index d6031c7,99b18aa..3f78619
--- 1/includes/filerepo/file/ArchivedFile.php
--- 2/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?

diff --cc includes/parser/Parser.php
Simple merge