X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStorage%2FRevisionStore.php;h=584142bfc1a9bf501513adf15c0b7057d4925f8b;hb=242a166d68c55e72d8bfe3f99872e80d64b2c30e;hp=2e3103c527a8d29f2a7ac696f68dd889a2daeb02;hpb=cf1021b879f1ba84ecaacf3864c8e693ee6bf9f0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Storage/RevisionStore.php b/includes/Storage/RevisionStore.php
index 2e3103c527..584142bfc1 100644
--- a/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@ -594,16 +594,17 @@ class RevisionStore
 
 		if ( $current ) {
 			$fields = [
-				'page'       => $title->getArticleID(),
-				'user_text'  => $user->getName(),
-				'user'       => $user->getId(),
-				'actor'      => $user->getActorId(),
-				'comment'    => $comment,
-				'minor_edit' => $minor,
-				'text_id'    => $current->rev_text_id,
-				'parent_id'  => $current->page_latest,
-				'len'        => $current->rev_len,
-				'sha1'       => $current->rev_sha1
+				'page'        => $title->getArticleID(),
+				'user_text'   => $user->getName(),
+				'user'        => $user->getId(),
+				'actor'       => $user->getActorId(),
+				'comment'     => $comment,
+				'minor_edit'  => $minor,
+				'text_id'     => $current->rev_text_id,
+				'parent_id'   => $current->page_latest,
+				'slot_origin' => $current->page_latest,
+				'len'         => $current->rev_len,
+				'sha1'        => $current->rev_sha1
 			];
 
 			if ( $this->contentHandlerUseDB ) {
@@ -771,6 +772,11 @@ class RevisionStore
 				$mainSlotRow->content_address = 'tt:' . $row->rev_text_id;
 			}
 
+			// This is used by null-revisions
+			$mainSlotRow->slot_origin = isset( $row->slot_origin )
+				? intval( $row->slot_origin )
+				: null;
+
 			if ( isset( $row->old_text ) ) {
 				// this happens when the text-table gets joined directly, in the pre-1.30 schema
 				$blobData = isset( $row->old_text ) ? strval( $row->old_text ) : null;
@@ -798,6 +804,9 @@ class RevisionStore
 			$mainSlotRow->slot_content_id = isset( $row['text_id'] )
 				? intval( $row['text_id'] )
 				: null;
+			$mainSlotRow->slot_origin = isset( $row['slot_origin'] )
+				? intval( $row['slot_origin'] )
+				: null;
 			$mainSlotRow->content_address = isset( $row['text_id'] )
 				? 'tt:' . intval( $row['text_id'] )
 				: null;
@@ -835,9 +844,11 @@ class RevisionStore
 			throw new MWException( 'Revision constructor passed invalid row format.' );
 		}
 
-		// With the old schema, the content changes with every revision.
-		// ...except for null-revisions. Would be nice if we could detect them.
-		$mainSlotRow->slot_inherited = 0;
+		// With the old schema, the content changes with every revision,
+		// except for null-revisions.
+		if ( !isset( $mainSlotRow->slot_origin ) ) {
+			$mainSlotRow->slot_origin = $mainSlotRow->slot_revision_id;
+		}
 
 		if ( $mainSlotRow->model_name === null ) {
 			$mainSlotRow->model_name = function ( SlotRecord $slot ) use ( $title ) {