Per comments on r88145: unlink file if it is broken

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

diff --git a/includes/Pager.php b/includes/Pager.php
index 8eb6c7c..c10dd95 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -93,6 +93,8 @@ abstract class IndexPager implements Pager {
 
        /**
         * Result object for the query. Warning: seek before use.
+        *
+        * @var ResultWrapper
         */
        public $mResult;
 
@@ -415,8 +417,10 @@ abstract class IndexPager implements Pager {
         * @return Associative array
         */
        function getDefaultQuery() {
+               global $wgRequest;
+
                if ( !isset( $this->mDefaultQuery ) ) {
-                       $this->mDefaultQuery = $_GET;
+                       $this->mDefaultQuery = $wgRequest->getQueryValues();
                        unset( $this->mDefaultQuery['title'] );
                        unset( $this->mDefaultQuery['dir'] );
                        unset( $this->mDefaultQuery['offset'] );
@@ -1025,14 +1029,16 @@ abstract class TablePager extends IndexPager {
 
        /**
         * Get <input type="hidden"> elements for use in a method="get" form.
-        * Resubmits all defined elements of the $_GET array, except for a
+        * Resubmits all defined elements of the query string, except for a
         * blacklist, passed in the $blacklist parameter.
         *
         * @return String: HTML fragment
         */
        function getHiddenFields( $blacklist = array() ) {
+               global $wgRequest;
+
                $blacklist = (array)$blacklist;
-               $query = $_GET;
+               $query = $wgRequest->getQueryValues();
                foreach ( $blacklist as $name ) {
                        unset( $query[$name] );
                }