r76482 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r76481‎ | r76482 | r76483 >
Date:22:49, 10 November 2010
Author:demon
Status:ok (Comments)
Tags:
Comment:
MFT r76481
Modified paths:
  • /branches/chad-pre-wmf-merge/extensions/FlaggedRevs (modified) (history)
  • /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php (modified) (history)

Diff [purge]

Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php
——@@ -1538,8 +1538,8 @@
15391539 $this->isReviewableDiff = true;
15401540 }
15411541 }
 1542+ $this->diffRevs = array( 'old' => $oldRev->getId(), 'new' => $newRev->getId() );
15421543 }
1543 - $this->diffRevs = array( 'old' => $oldRev->getId(), 'new' => $newRev->getId() );
15441544 return true;
15451545 }
15461546
Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs
___________________________________________________________________
Modified: svn:mergeinfo
15471547 Merged /trunk/extensions/FlaggedRevs:r76481

Follow-up revisions

RevisionCommit summaryAuthorDate
r76597Per CR on r76482, back out changes from r72509 and r74035, relies on core cha...demon21:23, 12 November 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r76481Followup r73164: Fix fatal if the oldrev or newrev isn't defined.demon22:46, 10 November 2010

Comments

#Comment by Aaron Schulz (talk | contribs)   03:53, 11 November 2010

You may as well merge everything in /trunk to /depl, except for the things that can't be, such as: i) The change for the new category schema (r72509) ii) The Title:GAID_FOR_UPDATE change (r74035) iii) The use of $select in FlaggedRevsHooks::addToRCQuery() (r71971)

#Comment by 😂 (talk | contribs)   21:26, 12 November 2010

I had merged most of trunk already, followed up with the remaining revs in r76596, backed out the category schema and GAID_FOR_UPDATE changes in r76597. I've already moved the changes to the RC query hook to deployment in r76485.

Status & tagging log