Merge "Fix sessionfailure i18n message during authentication"

[lhc/web/wiklou.git] / includes / filerepo / file / ArchivedFile.php

diff --git a/includes/filerepo/file/ArchivedFile.php b/includes/filerepo/file/ArchivedFile.php
index 6984d48..6577ab6 100644 (file)
--- a/includes/filerepo/file/ArchivedFile.php
+++ b/includes/filerepo/file/ArchivedFile.php
@@ -178,12 +178,14 @@ 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_REPLICA );
+                       $fileQuery = self::getQueryInfo();
                        $row = $dbr->selectRow(
-                               'filearchive',
-                               self::selectFields(),
+                               $fileQuery['tables'],
+                               $fileQuery['fields'],
                                $conds,
                                __METHOD__,
-                               [ 'ORDER BY' => 'fa_timestamp DESC' ]
+                               [ 'ORDER BY' => 'fa_timestamp DESC' ],
+                               $fileQuery['joins']
                        );
                        if ( !$row ) {
                                // this revision does not exist?
@@ -215,9 +217,11 @@ class ArchivedFile {
 
        /**
         * Fields in the filearchive table
+        * @deprecated since 1.31, use self::getQueryInfo() instead.
         * @return array
         */
        static function selectFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [
                        'fa_id',
                        'fa_name',
@@ -232,13 +236,50 @@ class ArchivedFile {
                        'fa_media_type',
                        'fa_major_mime',
                        'fa_minor_mime',
-                       'fa_description',
                        'fa_user',
                        'fa_user_text',
                        'fa_timestamp',
                        'fa_deleted',
                        'fa_deleted_timestamp', /* Used by LocalFileRestoreBatch */
                        'fa_sha1',
+               ] + CommentStore::getStore()->getFields( 'fa_description' );
+       }
+
+       /**
+        * Return the tables, fields, and join conditions to be selected to create
+        * a new archivedfile object.
+        * @since 1.31
+        * @return array With three keys:
+        *   - tables: (string[]) to include in the `$table` to `IDatabase->select()`
+        *   - fields: (string[]) to include in the `$vars` to `IDatabase->select()`
+        *   - joins: (array) to include in the `$join_conds` to `IDatabase->select()`
+        */
+       public static function getQueryInfo() {
+               $commentQuery = CommentStore::getStore()->getJoin( 'fa_description' );
+               return [
+                       'tables' => [ 'filearchive' ] + $commentQuery['tables'],
+                       'fields' => [
+                               '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_user',
+                               'fa_user_text',
+                               'fa_timestamp',
+                               'fa_deleted',
+                               'fa_deleted_timestamp', /* Used by LocalFileRestoreBatch */
+                               'fa_sha1',
+                       ] + $commentQuery['fields'],
+                       'joins' => $commentQuery['joins'],
                ];
        }
 
@@ -261,7 +302,9 @@ class ArchivedFile {
                $this->metadata = $row->fa_metadata;
                $this->mime = "$row->fa_major_mime/$row->fa_minor_mime";
                $this->media_type = $row->fa_media_type;
-               $this->description = $row->fa_description;
+               $this->description = CommentStore::getStore()
+                       // Legacy because $row may have come from self::selectFields()
+                       ->getCommentLegacy( wfGetDB( DB_REPLICA ), 'fa_description', $row )->text;
                $this->user = $row->fa_user;
                $this->user_text = $row->fa_user_text;
                $this->timestamp = $row->fa_timestamp;