Merge "Remove extra unneeded whitespace"

[lhc/web/wiklou.git] / includes / Export.php

diff --git a/includes/Export.php b/includes/Export.php
index 811d716..c201c97 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -338,7 +338,7 @@ class WikiExporter {
                        } elseif ( $this->history & WikiExporter::RANGE ) {
                                # Dump of revisions within a specified range
                                $join['revision'] = array( 'INNER JOIN', 'page_id=rev_page' );
-                               $opts['ORDER BY'] = 'rev_page ASC, rev_id ASC';
+                               $opts['ORDER BY'] = array( 'rev_page ASC', 'rev_id ASC' );
                        } else {
                                # Uknown history specification parameter?
                                wfProfileOut( __METHOD__ );
@@ -1177,8 +1177,10 @@ class DumpFilter {
 
        /**
         * @var DumpOutput
+        * FIXME will need to be made protected whenever legacy code
+        * is updated.
         */
-       protected $sink;
+       public $sink;
 
        /**
         * @var bool