http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100304
Revision: 100304
Author: aaron
Date: 2011-10-20 00:41:48 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
FU r100300, r100286:
* Updated link batch code in MergeHistory
* Marked some Revision functions explicitly public
Modified Paths:
--------------
trunk/phase3/includes/Revision.php
trunk/phase3/includes/specials/SpecialMergeHistory.php
Modified: trunk/phase3/includes/Revision.php
===================================================================
--- trunk/phase3/includes/Revision.php 2011-10-20 00:40:32 UTC (rev 100303)
+++ trunk/phase3/includes/Revision.php 2011-10-20 00:41:48 UTC (rev 100304)
@@ -305,7 +305,7 @@
* 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 @@
/**
* 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 @@
/**
* 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' );
}
Modified: trunk/phase3/includes/specials/SpecialMergeHistory.php
===================================================================
--- trunk/phase3/includes/specials/SpecialMergeHistory.php 2011-10-20
00:40:32 UTC (rev 100303)
+++ trunk/phase3/includes/specials/SpecialMergeHistory.php 2011-10-20
00:41:48 UTC (rev 100304)
@@ -452,8 +452,8 @@
# 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 ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
