(bug 18180) Special:Export ignores limit, dir, offset parameters. Patch by azliq7

diff --git a/CREDITS b/CREDITS
index 86034bd..377a2a3 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -58,6 +58,7 @@ following names for their contribution to the product.
 == Patch Contributors ==
 * Agbad
 * Ahmad Sherif
+* Azliq7
 * Borislav Manolov
 * Brad Jorsch
 * Brent G

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6cebc5d..384c460 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -498,6 +498,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 20624) Installation no longer allows "qqq" as the chosen language
 * (bug 20634) The installer-created database user will now have CREATE TABLE 
   and ALTER TABLE rights so that upgrades will go more smoothly.
+* (bug 18180) Special:Export ignores limit, dir, offset parameters
 
 == API changes in 1.16 ==
 

diff --git a/includes/Export.php b/includes/Export.php
index f05b660..b6e5041 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -207,11 +207,8 @@ class WikiExporter {
                        $opts = array( 'ORDER BY' => 'page_id ASC' );
                        $opts['USE INDEX'] = array();
                        $join = array();
-                       # Full history dumps...
-                       if( $this->history & WikiExporter::FULL ) {
-                               $join['revision'] = array('INNER JOIN','page_id=rev_page');
                        # Latest revision dumps...
-                       } elseif( $this->history & WikiExporter::CURRENT ) {
+                       if( $this->history & WikiExporter::CURRENT ) {
                                if( $this->list_authors && $cond != '' )  { // List authors, if so desired
                                        list($page,$revision) = $this->db->tableNamesN('page','revision');
                                        $this->do_list_authors( $page, $revision, $cond );
@@ -247,6 +244,9 @@ class WikiExporter {
                                if( !empty( $this->history['limit'] ) ) {
                                        $opts['LIMIT'] = intval( $this->history['limit'] );
                                }
+                       # Full history dumps...
+                       } elseif( $this->history & WikiExporter::FULL ) {
+                               $join['revision'] = array('INNER JOIN','page_id=rev_page');
                        # Uknown history specification parameter?
                        } else {
                                wfProfileOut( __METHOD__ );