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=a17ca6e25a3bca4ec8fb3cc9d007ead6c746a86f;hb=1d7a1bf8bddf0908e4f572c82268733f63126a13;hpb=adae996840b9e782f6e14b21c433a83e37c3a74e

diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php
index a17ca6e25a..b46e1e466f 100644
--- a/includes/filerepo/file/OldLocalFile.php
+++ b/includes/filerepo/file/OldLocalFile.php
@@ -86,7 +86,7 @@ class OldLocalFile extends LocalFile {
 	 * @return bool|OldLocalFile
 	 */
 	static function newFromKey( $sha1, $repo, $timestamp = false ) {
-		$dbr = $repo->getSlaveDB();
+		$dbr = $repo->getReplicaDB();
 
 		$conds = [ 'oi_sha1' => $sha1 ];
 		if ( $timestamp ) {
@@ -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();
 	}
 
 	/**
@@ -179,7 +180,7 @@ class OldLocalFile extends LocalFile {
 
 		$dbr = ( $flags & self::READ_LATEST )
 			? $this->repo->getMasterDB()
-			: $this->repo->getSlaveDB();
+			: $this->repo->getReplicaDB();
 
 		$conds = [ 'oi_name' => $this->getName() ];
 		if ( is_null( $this->requestedTime ) ) {
@@ -194,16 +195,14 @@ class OldLocalFile extends LocalFile {
 		} else {
 			$this->fileExists = false;
 		}
-
 	}
 
 	/**
 	 * Load lazy file metadata from the DB
 	 */
 	protected function loadExtraFromDB() {
-
 		$this->extraDataLoaded = true;
-		$dbr = $this->repo->getSlaveDB();
+		$dbr = $this->repo->getReplicaDB();
 		$conds = [ 'oi_name' => $this->getName() ];
 		if ( is_null( $this->requestedTime ) ) {
 			$conds['oi_archive_name'] = $this->archive_name;
@@ -227,7 +226,6 @@ class OldLocalFile extends LocalFile {
 		} else {
 			throw new MWException( "Could not find data for image '{$this->archive_name}'." );
 		}
-
 	}
 
 	/**
@@ -370,6 +368,7 @@ class OldLocalFile extends LocalFile {
 			return false;
 		}
 
+		$commentFields = CommentStore::newKey( 'oi_description' )->insert( $dbw, $comment );
 		$dbw->insert( 'oldimage',
 			[
 				'oi_name' => $this->getName(),
@@ -379,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'],
@@ -387,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;