http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100153
Revision: 100153
Author: aaron
Date: 2011-10-18 20:19:55 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Fixed missing review form for diffs against non-stable but accepted revs with
diffonly=1
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
2011-10-18 20:04:33 UTC (rev 100152)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
2011-10-18 20:19:55 UTC (rev 100153)
@@ -1079,9 +1079,9 @@
}
# Get the revision being displayed
$rev = false;
- if ( $this->reviewFormRev ) {
+ if ( $this->reviewFormRev ) { // diff
$rev = $this->reviewFormRev; // $newRev for diffs
stored here
- } elseif ( $this->out->getRevisionId() ) {
+ } elseif ( $this->out->getRevisionId() ) { // page view
$rev = Revision::newFromId( $this->out->getRevisionId()
);
}
# Build the review form as needed
@@ -1387,6 +1387,9 @@
return true;
}
$srev = $this->article->getStableRev();
+ if ( $srev && $this->isReviewableDiff ) {
+ $this->reviewFormRev = $newRev;
+ }
# Check if this is a diff-to-stable. If so:
# (a) prompt reviewers to review the changes
# (b) list template/file changes if only includes are pending
@@ -1395,7 +1398,6 @@
&& !$this->article->stableVersionIsSynced() ) //
pending changes
{
$changeText = '';
- $this->reviewFormRev = $newRev;
$changeList = array();
# Page not synced only due to includes?
if ( !$this->article->revsArePending() ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
