r78321 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r78320‎ | r78321 | r78322 >
Date:20:02, 13 December 2010
Author:pdhanda
Status:ok
Tags:
Comment:
Fixed bad merge r78214. Merged r78319
Modified paths:
  • /branches/priyanka-wmf-fixes/extensions/FlaggedRevs/FlaggedRevs.hooks.php (modified) (history)

Diff [purge]

Index: branches/priyanka-wmf-fixes/extensions/FlaggedRevs/FlaggedRevs.hooks.php
@@ -1813,13 +1813,13 @@
18141814 /*
18151815 * If an article is reviewable, get custom article contents from the FlaggedArticleView
18161816 */
1817 - public static function onArticleContentOnDiff( $diffEngine, $out, $newRevId ) {
 1817+ public static function onArticleContentOnDiff( $diffEngine, $out ) {
18181818 $fa = FlaggedArticle::getTitleInstance( $out->getTitle() );
18191819 if ( !$fa->isReviewable() ) {
18201820 return true; // nothing to do
18211821 }
18221822 $view = FlaggedArticleView::singleton();
1823 - $view->addCustomContentHtml( $out, $newRevId );
 1823+ $view->addCustomContentHtml( $out, $diffEngine->getNewid() );
18241824 return false;
18251825 }
18261826

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r78214Merged r78213 from trunkpdhanda23:36, 10 December 2010
r78319Used accessor method instead of raw field. Follow up to r78213pdhanda19:57, 13 December 2010

Status & tagging log