X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FOldLocalFile.php;h=b46e1e466fe5dd70507dba153672bb34cf7e3e76;hp=dfaae731c18528235f410daa6a8e4d1c3c98a94f;hb=1d7a1bf8bddf0908e4f572c82268733f63126a13;hpb=6124d71e25c2894c3e025c20e81ff742045e8cd5

diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php
index dfaae731c1..b46e1e466f 100644
--- a/includes/filerepo/file/OldLocalFile.php
+++ b/includes/filerepo/file/OldLocalFile.php
@@ -103,6 +103,8 @@ class OldLocalFile extends LocalFile {
 
 	/**
 	 * Fields in the oldimage table
+	 * @todo Deprecate this in favor of a method that returns tables and joins
+	 *  as well, and use CommentStore::getJoin().
 	 * @return array
 	 */
 	static function selectFields() {
@@ -117,13 +119,12 @@ class OldLocalFile extends LocalFile {
 			'oi_media_type',
 			'oi_major_mime',
 			'oi_minor_mime',
-			'oi_description',
 			'oi_user',
 			'oi_user_text',
 			'oi_timestamp',
 			'oi_deleted',
 			'oi_sha1',
-		];
+		] + CommentStore::newKey( 'oi_description' )->getFields();
 	}
 
 	/**
@@ -367,6 +368,7 @@ class OldLocalFile extends LocalFile {
 			return false;
 		}
 
+		$commentFields = CommentStore::newKey( 'oi_description' )->insert( $dbw, $comment );
 		$dbw->insert( 'oldimage',
 			[
 				'oi_name' => $this->getName(),
@@ -376,7 +378,6 @@ class OldLocalFile extends LocalFile {
 				'oi_height' => intval( $props['height'] ),
 				'oi_bits' => $props['bits'],
 				'oi_timestamp' => $dbw->timestamp( $timestamp ),
-				'oi_description' => $comment,
 				'oi_user' => $user->getId(),
 				'oi_user_text' => $user->getName(),
 				'oi_metadata' => $props['metadata'],
@@ -384,7 +385,7 @@ class OldLocalFile extends LocalFile {
 				'oi_major_mime' => $props['major_mime'],
 				'oi_minor_mime' => $props['minor_mime'],
 				'oi_sha1' => $props['sha1'],
-			], __METHOD__
+			] + $commentFields, __METHOD__
 		);
 
 		return true;