(follow-up r65035/r65013) The username parameter wasn't preserved when clicking links...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 576edb0..649c444 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -193,6 +193,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
   for "ABORTED" reason to be returned and displayed to user.
 * (bug 28034) uploading file to local wiki when file exists on shared repository
   (commons) gives spurious info in the warning message
+* Usernames get lost when selecting different sorts on Special:listfiles
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/specials/SpecialListfiles.php b/includes/specials/SpecialListfiles.php
index 49eb60a..a6bc714 100644 (file)
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -238,9 +238,19 @@ class ImageListPager extends TablePager {
                if ( !is_null( $this->mUserName ) ) {
                        # Append the username to the query string
                        foreach ( $queries as &$query ) {
-                               $query['username'] = $this->mUserName;
+                               $query['user'] = $this->mUserName;
                        }
                }
                return $queries;
        }
+
+       function getDefaultQuery() {
+               $queries = parent::getDefaultQuery();
+               if ( !isset( $queries['user'] )
+                       && !is_null( $this->mUserName ) )
+               {
+                       $queries['user'] = $this->mUserName;
+               }
+               return $queries;
+       }
 }