X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Flogging%2FLogEntry.php;h=8b51932be77c141633a085dcf3d786a9e6f605d2;hp=fa94fe5b23ca529de9bb8ecaaa9d3923ff930817;hb=3df3b575c6617df64ec98533cc7141bd2314e274;hpb=d5a7166771613dfe4ed9fb75fa5efeced6134bd1

diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index fa94fe5b23..8b51932be7 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -170,19 +170,21 @@ class DatabaseLogEntry extends LogEntryBase {
 	 * @return array
 	 */
 	public static function getSelectQueryData() {
-		$tables = [ 'logging', 'user' ];
+		$commentQuery = CommentStore::newKey( 'log_comment' )->getJoin();
+
+		$tables = [ 'logging', 'user' ] + $commentQuery['tables'];
 		$fields = [
 			'log_id', 'log_type', 'log_action', 'log_timestamp',
 			'log_user', 'log_user_text',
 			'log_namespace', 'log_title', // unused log_page
-			'log_comment', 'log_params', 'log_deleted',
+			'log_params', 'log_deleted',
 			'user_id', 'user_name', 'user_editcount',
-		];
+		] + $commentQuery['fields'];
 
 		$joins = [
 			// IPs don't have an entry in user table
 			'user' => [ 'LEFT JOIN', 'log_user=user_id' ],
-		];
+		] + $commentQuery['joins'];
 
 		return [
 			'tables' => $tables,
@@ -322,7 +324,7 @@ class DatabaseLogEntry extends LogEntryBase {
 	}
 
 	public function getComment() {
-		return $this->row->log_comment;
+		return CommentStore::newKey( 'log_comment' )->getComment( $this->row )->text;
 	}
 
 	public function getDeleted() {
@@ -380,7 +382,9 @@ class RCDatabaseLogEntry extends DatabaseLogEntry {
 	}
 
 	public function getComment() {
-		return $this->row->rc_comment;
+		return CommentStore::newKey( 'rc_comment' )
+			// Legacy because the row probably used RecentChange::selectFields()
+			->getCommentLegacy( wfGetDB( DB_REPLICA ), $this->row )->text;
 	}
 
 	public function getDeleted() {
@@ -589,10 +593,7 @@ class ManualLogEntry extends LogEntryBase {
 	 * @throws MWException
 	 */
 	public function insert( IDatabase $dbw = null ) {
-		global $wgContLang;
-
 		$dbw = $dbw ?: wfGetDB( DB_MASTER );
-		$id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
 
 		if ( $this->timestamp === null ) {
 			$this->timestamp = wfTimestampNow();
@@ -601,9 +602,6 @@ class ManualLogEntry extends LogEntryBase {
 		// Trim spaces on user supplied text
 		$comment = trim( $this->getComment() );
 
-		// Truncate for whole multibyte characters.
-		$comment = $wgContLang->truncate( $comment, 255 );
-
 		$params = $this->getParameters();
 		$relations = $this->relations;
 
@@ -615,7 +613,6 @@ class ManualLogEntry extends LogEntryBase {
 		}
 
 		$data = [
-			'log_id' => $id,
 			'log_type' => $this->getType(),
 			'log_action' => $this->getSubtype(),
 			'log_timestamp' => $dbw->timestamp( $this->getTimestamp() ),
@@ -624,12 +621,12 @@ class ManualLogEntry extends LogEntryBase {
 			'log_namespace' => $this->getTarget()->getNamespace(),
 			'log_title' => $this->getTarget()->getDBkey(),
 			'log_page' => $this->getTarget()->getArticleID(),
-			'log_comment' => $comment,
 			'log_params' => LogEntryBase::makeParamBlob( $params ),
 		];
 		if ( isset( $this->deleted ) ) {
 			$data['log_deleted'] = $this->deleted;
 		}
+		$data += CommentStore::newKey( 'log_comment' )->insert( $dbw, $comment );
 
 		$dbw->insert( 'logging', $data, __METHOD__ );
 		$this->id = $dbw->insertId();