FU r100300, r100286:

* Updated link batch code in MergeHistory
* Marked some Revision functions explicitly public

diff --git a/includes/Revision.php b/includes/Revision.php
index 065d7f9..a379d88 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -305,7 +305,7 @@ class Revision {
         * Return the list of text fields that should be selected to read the
         * revision text
         */
-       static function selectTextFields() {
+       public static function selectTextFields() {
                return array(
                        'old_text',
                        'old_flags'
@@ -315,7 +315,7 @@ class Revision {
        /**
         * Return the list of page fields that should be selected from page table
         */
-       static function selectPageFields() {
+       public static function selectPageFields() {
                return array(
                        'page_namespace',
                        'page_title',
@@ -326,7 +326,7 @@ class Revision {
        /**
         * Return the list of user fields that should be selected from user table
         */
-       static function selectUserFields() {
+       public static function selectUserFields() {
                return array( 'COALESCE(user_name,rev_user_text) AS rev_user_name' );
        }
 

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 1d9960a..2d86131 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -452,8 +452,8 @@ class MergeHistoryPager extends ReverseChronologicalPager {
                # Give some pointers to make (last) links
                $this->mForm->prevId = array();
                foreach ( $this->mResult as $row ) {
-                       $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_text ) );
-                       $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_text ) );
+                       $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_name ) );
+                       $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_name ) );
 
                        $rev_id = isset( $rev_id ) ? $rev_id : $row->rev_id;
                        if( $rev_id > $row->rev_id ) {