From: Ariel T. Glenn <ariel@wikimedia.org>
Date: Thu, 25 Oct 2018 10:23:01 +0000 (+0300)
Subject: always order by page_id for dumps of current revisions
X-Git-Tag: 1.34.0-rc.0~1541^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=c27ced4f31e50597a53e4682c0088f98a5b9700a;p=lhc%2Fweb%2Fwiklou.git

always order by page_id for dumps of current revisions

Also drop ordering of revs within pages, since there is only one
revision being dumped

Bug: T207628
Change-Id: I5e4f0bea7b54506ca389818407c43152a290da6e
---

diff --git a/includes/export/WikiExporter.php b/includes/export/WikiExporter.php
index ca63dfebf3..e8044af455 100644
--- a/includes/export/WikiExporter.php
+++ b/includes/export/WikiExporter.php
@@ -399,6 +399,7 @@ class WikiExporter {
 				$this->do_list_authors( $cond );
 			}
 			$join['revision'] = [ 'JOIN', 'page_id=rev_page AND page_latest=rev_id' ];
+			$opts[ 'ORDER BY' ] = [ 'page_id ASC' ];
 		} elseif ( $this->history & self::STABLE ) {
 			# "Stable" revision dumps...
 			# Default JOIN, to be overridden...