Fall back to autoincrement when page cannot be recreated with old ID

Fixes I882b8ba09d68e7475e1d0934328730059574e292.

Bug: T28123
Change-Id: Ib029407d8e21f041803131143ff4dc0856803c60

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index b36860f..744a090 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -569,6 +569,10 @@ class PageArchive {
                        }
                        // Safe to insert now...
                        $newid = $article->insertOn( $dbw, $row->ar_page_id );
+                       if ( $newid === false ) {
+                               // The old ID is reserved; let's pick another
+                               $newid = $article->insertOn( $dbw );
+                       }
                        $pageId = $newid;
                } else {
                        // Check if a deleted revision will become the current revision...