r57062 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r57061‎ | r57062 | r57063 >
Date:17:10, 29 September 2009
Author:aaron
Status:ok
Tags:
Comment:
merged r57061: review log fix
Modified paths:
  • /branches/wmf-deployment/extensions/FlaggedRevs/FlaggedRevs.hooks.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/FlaggedRevs/FlaggedRevs.hooks.php
@@ -1385,23 +1385,25 @@
13861386 * @param string $action
13871387 * @param object $title
13881388 * @param array $params
 1389+ * @param string $comment
 1390+ * @param string $rv (review links)
13891391 * @return bool true
13901392 */
1391 - public static function reviewLogLine( $type='', $action='', $title=null, $params=array() ) {
 1393+ public static function reviewLogLine( $type, $action, $title=null, $params=array(), &$comment, &$rv ) {
13921394 $actionsValid = array('approve','approve2','approve-a','approve2-a','unapprove','unapprove2');
13931395 # Show link to page with oldid=x
1394 - if( $type == 'review' && in_array($action,$actionsValid) && is_object($title) && isset($params[0]) ) {
 1396+ if( $type == 'review' && is_object($title) && in_array($action,$actionsValid) && isset($params[0]) ) {
13951397 global $wgUser;
13961398 # Load required messages
13971399 wfLoadExtensionMessages( 'FlaggedRevs' );
13981400 # Don't show diff if param missing or rev IDs are the same
13991401 if( !empty($params[1]) && $params[0] != $params[1] ) {
1400 - $r = '(' . $wgUser->getSkin()->makeKnownLinkObj( $title, wfMsgHtml('review-logentry-diff'),
 1402+ $rv = '(' . $wgUser->getSkin()->makeKnownLinkObj( $title, wfMsgHtml('review-logentry-diff'),
14011403 "oldid={$params[1]}&diff={$params[0]}") . ') ';
14021404 } else {
1403 - $r = '(' . wfMsgHtml('review-logentry-diff') . ')';
 1405+ $rv = '(' . wfMsgHtml('review-logentry-diff') . ')';
14041406 }
1405 - $r .= ' (' . $wgUser->getSkin()->makeKnownLinkObj( $title,
 1407+ $rv .= ' (' . $wgUser->getSkin()->makeKnownLinkObj( $title,
14061408 wfMsgHtml('review-logentry-id',$params[0]),
14071409 "oldid={$params[0]}&diff=prev&diffonly=0") . ')';
14081410 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r57061Fixed reviewLogLine(), which got broken sometimeaaron17:08, 29 September 2009

Status & tagging log