From ab64932ba8e9fd471c7cce17aa4bbc216d3fcf17 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 7 Sep 2010 11:37:37 +0000 Subject: [PATCH] Partial revert r72527, unrelated/unfinished changes --- includes/diff/DifferenceInterface.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php index 7ec7626d45..64975bb4d1 100644 --- a/includes/diff/DifferenceInterface.php +++ b/includes/diff/DifferenceInterface.php @@ -812,21 +812,10 @@ CONTROL; } $n = $this->mTitle->countRevisionsBetween( $oldid, $newid ); - if ( !$n ) { + if ( !$n ) return ''; - } else { - global $wgLang; - $dbr = wfGetDB( DB_SLAVE ); - $res = $dbr->select( 'revision', 'DISTINCT rev_user_text', - array( - 'rev_page = ' . $this->mOldRev->getPage(), - 'rev_id > ' . $this->mOldRev->getId(), - 'rev_id < ' . $this->mNewRev->getId() - ), __METHOD__, array( 'LIMIT' => 1 ) - ); - return wfMsgExt( 'diff-multi', array( 'parseinline' ), $wgLang->formatNum( $n ), - $wgLang->formatNum( $dbr->numRows( $res ) ) ); - } + + return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n ); } -- 2.20.1