* (bug 4268) Fixed data-loss bug in compressOld batch text compression

  affecting pages which had null edits (move, protect, etc) as second
  edit in a batch group. Isolated and patched by Travis Derouin.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9eb36e2..878f91c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -163,6 +163,9 @@ lighter making things easier to read.
 * (bug 6987) Allow perrow, widths, and heights attributes for <gallery>
 * (bug 8858) Safer handling when $wgImageLimits is changed. Added a note
   in DefaultSettings to make it clear.
+* (bug 4268) Fixed data-loss bug in compressOld batch text compression
+  affecting pages which had null edits (move, protect, etc) as second
+  edit in a batch group. Isolated and patched by Travis Derouin.
 
 
 == Languages updated ==

diff --git a/maintenance/storage/compressOld.inc b/maintenance/storage/compressOld.inc
index bd1bace..2da015b 100644 (file)
--- a/maintenance/storage/compressOld.inc
+++ b/maintenance/storage/compressOld.inc
@@ -276,8 +276,8 @@ function compressWithConcat( $startId, $maxChunkSize, $maxChunkFactor, $factorTh
 
                                        # Store the stub objects
                                        for ( $j = 1; $j < $thisChunkSize; $j++ ) {
-                                               # Skip if not compressing
-                                               if ( $stubs[$j] !== false ) {
+                                               # Skip if not compressing and don't overwrite the first revision
+                                               if ( $stubs[$j] !== false && $revs[$i + $j]->rev_text_id != $primaryOldid ) {
                                                        $dbw->update( 'text',
                                                                array( /* SET */
                                                                        'old_text' => serialize($stubs[$j]),