Merge "Fix ParserOutput::getText 'unwrap' flag for end-of-doc comment"

[lhc/web/wiklou.git] / includes / logging / LogEntry.php

diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 75617d9..16b3593 100644 (file)
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -170,7 +170,7 @@ class DatabaseLogEntry extends LogEntryBase {
         * @return array
         */
        public static function getSelectQueryData() {
-               $commentQuery = CommentStore::newKey( 'log_comment' )->getJoin();
+               $commentQuery = CommentStore::getStore()->getJoin( 'log_comment' );
 
                $tables = [ 'logging', 'user' ] + $commentQuery['tables'];
                $fields = [
@@ -324,7 +324,7 @@ class DatabaseLogEntry extends LogEntryBase {
        }
 
        public function getComment() {
-               return CommentStore::newKey( 'log_comment' )->getComment( $this->row )->text;
+               return CommentStore::getStore()->getComment( 'log_comment', $this->row )->text;
        }
 
        public function getDeleted() {
@@ -382,9 +382,9 @@ class RCDatabaseLogEntry extends DatabaseLogEntry {
        }
 
        public function getComment() {
-               return CommentStore::newKey( 'rc_comment' )
-                       // Legacy because the row probably used RecentChange::selectFields()
-                       ->getCommentLegacy( wfGetDB( DB_REPLICA ), $this->row )->text;
+               return CommentStore::getStore()
+                       // Legacy because the row may have used RecentChange::selectFields()
+                       ->getCommentLegacy( wfGetDB( DB_REPLICA ), 'rc_comment', $this->row )->text;
        }
 
        public function getDeleted() {
@@ -594,7 +594,6 @@ class ManualLogEntry extends LogEntryBase {
         */
        public function insert( IDatabase $dbw = null ) {
                $dbw = $dbw ?: wfGetDB( DB_MASTER );
-               $id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
 
                if ( $this->timestamp === null ) {
                        $this->timestamp = wfTimestampNow();
@@ -614,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() ),
@@ -628,7 +626,7 @@ class ManualLogEntry extends LogEntryBase {
                if ( isset( $this->deleted ) ) {
                        $data['log_deleted'] = $this->deleted;
                }
-               $data += CommentStore::newKey( 'log_comment' )->insert( $dbw, $comment );
+               $data += CommentStore::getStore()->insert( $dbw, 'log_comment', $comment );
 
                $dbw->insert( 'logging', $data, __METHOD__ );
                $this->id = $dbw->insertId();