| Index: branches/wmf/1.18wmf1/extensions/FlaggedRevs/presentation/FlaggedPageView.php |
| — | — | @@ -1076,9 +1076,9 @@ |
| 1077 | 1077 | } |
| 1078 | 1078 | # Get the revision being displayed |
| 1079 | 1079 | $rev = false; |
| 1080 | | - if ( $this->reviewFormRev ) { |
| | 1080 | + if ( $this->reviewFormRev ) { //diff |
| 1081 | 1081 | $rev = $this->reviewFormRev; // $newRev for diffs stored here |
| 1082 | | - } elseif ( $this->out->getRevisionId() ) { |
| | 1082 | + } elseif ( $this->out->getRevisionId() ) { // page view |
| 1083 | 1083 | $rev = Revision::newFromId( $this->out->getRevisionId() ); |
| 1084 | 1084 | } |
| 1085 | 1085 | # Build the review form as needed |
| — | — | @@ -1377,6 +1377,9 @@ |
| 1378 | 1378 | return true; |
| 1379 | 1379 | } |
| 1380 | 1380 | $srev = $this->article->getStableRev(); |
| | 1381 | + if ( $srev && $this->isReviewableDiff ) { |
| | 1382 | + $this->reviewFormRev = $newRev; |
| | 1383 | + } |
| 1381 | 1384 | # Check if this is a diff-to-stable. If so: |
| 1382 | 1385 | # (a) prompt reviewers to review the changes |
| 1383 | 1386 | # (b) list template/file changes if only includes are pending |
| — | — | @@ -1385,7 +1388,6 @@ |
| 1386 | 1389 | && !$this->article->stableVersionIsSynced() ) // pending changes |
| 1387 | 1390 | { |
| 1388 | 1391 | $changeDiv = ''; |
| 1389 | | - $this->reviewFormRev = $newRev; |
| 1390 | 1392 | $changeList = array(); |
| 1391 | 1393 | # Page not synced only due to includes? |
| 1392 | 1394 | if ( !$this->article->revsArePending() ) { |
| Property changes on: branches/wmf/1.18wmf1/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1393 | 1395 | Merged /branches/REL1_18/extensions/FlaggedRevs:r103190 |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1394 | 1396 | Merged /branches/REL1_18/extensions:r103190 |