| Index: trunk/phase3/includes/Revision.php |
| — | — | @@ -305,7 +305,7 @@ |
| 306 | 306 | * Return the list of text fields that should be selected to read the |
| 307 | 307 | * revision text |
| 308 | 308 | */ |
| 309 | | - static function selectTextFields() { |
| | 309 | + public static function selectTextFields() { |
| 310 | 310 | return array( |
| 311 | 311 | 'old_text', |
| 312 | 312 | 'old_flags' |
| — | — | @@ -315,7 +315,7 @@ |
| 316 | 316 | /** |
| 317 | 317 | * Return the list of page fields that should be selected from page table |
| 318 | 318 | */ |
| 319 | | - static function selectPageFields() { |
| | 319 | + public static function selectPageFields() { |
| 320 | 320 | return array( |
| 321 | 321 | 'page_namespace', |
| 322 | 322 | 'page_title', |
| — | — | @@ -326,7 +326,7 @@ |
| 327 | 327 | /** |
| 328 | 328 | * Return the list of user fields that should be selected from user table |
| 329 | 329 | */ |
| 330 | | - static function selectUserFields() { |
| | 330 | + public static function selectUserFields() { |
| 331 | 331 | return array( 'COALESCE(user_name,rev_user_text) AS rev_user_name' ); |
| 332 | 332 | } |
| 333 | 333 | |
| Index: trunk/phase3/includes/specials/SpecialMergeHistory.php |
| — | — | @@ -452,8 +452,8 @@ |
| 453 | 453 | # Give some pointers to make (last) links |
| 454 | 454 | $this->mForm->prevId = array(); |
| 455 | 455 | foreach ( $this->mResult as $row ) { |
| 456 | | - $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_text ) ); |
| 457 | | - $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_text ) ); |
| | 456 | + $batch->addObj( Title::makeTitleSafe( NS_USER, $row->rev_user_name ) ); |
| | 457 | + $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->rev_user_name ) ); |
| 458 | 458 | |
| 459 | 459 | $rev_id = isset( $rev_id ) ? $rev_id : $row->rev_id; |
| 460 | 460 | if( $rev_id > $row->rev_id ) { |