r76916 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76915‎ | r76916 | r76917 >
Date:23:12, 17 November 2010
Author:pdhanda
Status:deferred
Tags:
Comment:
Merged r76908 from trunk
Modified paths:
  • /branches/chad-pre-wmf-merge/extensions/FlaggedRevs (modified) (history)
  • /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php (modified) (history)
  • /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language (modified) (history)

Diff [purge]

Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language
___________________________________________________________________
Modified: svn:mergeinfo
11 Merged /trunk/extensions/FlaggedRevs/language:r76908
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php
@@ -1248,8 +1248,9 @@
12491249 }
12501250
12511251 /**
 1252+ * Adds notes by the reviewer to the bottom of the page
12521253 * @param FlaggedRevision $frev
1253 - * @return string, revision review notes
 1254+ * @return void
12541255 */
12551256 public function setReviewNotes( $frev ) {
12561257 global $wgUser;
@@ -1263,19 +1264,19 @@
12641265 }
12651266 }
12661267
1267 -/**
 1268+ /**
 1269+ * Adds a notice saying that this revision is pending review
12681270 * @param FlaggedRevision $frev
1269 - * Adds a notice saying that this is a revision that is pending review
 1271+ * @return void
12701272 */
12711273 public function setPendingNotice( $frev ) {
12721274 global $wgLang;
12731275 $this->load();
12741276 $time = $wgLang->date( $frev->getTimestamp(), true );
1275 - $pendingNotice = wfMsgExt( 'revreview-pendingnotice', array( 'parseinline' ), $time );
 1277+ $pendingNotice = wfMsgExt( 'revreview-pendingnotice', 'parseinline', $time );
12761278 $this->reviewNotice .= "<div id='mw-fr-reviewnotice' class='flaggedrevs_preview plainlinks'>" .
12771279 $pendingNotice . "</div>";
12781280 }
1279 -
12801281
12811282 /**
12821283 * When viewing a diff:
Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs
___________________________________________________________________
Modified: svn:mergeinfo
12831284 Merged /trunk/extensions/FlaggedRevs:r76908

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r76908Tiny style & doc cleanupsaaron21:35, 17 November 2010

Status & tagging log