| Index: branches/REL1_18/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 |
| — | — | @@ -1371,6 +1371,9 @@ |
| 1372 | 1372 | return true; |
| 1373 | 1373 | } |
| 1374 | 1374 | $srev = $this->article->getStableRev(); |
| | 1375 | + if ( $srev && $this->isReviewableDiff ) { |
| | 1376 | + $this->reviewFormRev = $newRev; |
| | 1377 | + } |
| 1375 | 1378 | # Check if this is a diff-to-stable. If so: |
| 1376 | 1379 | # (a) prompt reviewers to review the changes |
| 1377 | 1380 | # (b) list template/file changes if only includes are pending |
| — | — | @@ -1379,7 +1382,6 @@ |
| 1380 | 1383 | && !$this->article->stableVersionIsSynced() ) // pending changes |
| 1381 | 1384 | { |
| 1382 | 1385 | $changeDiv = ''; |
| 1383 | | - $this->reviewFormRev = $newRev; |
| 1384 | 1386 | $changeList = array(); |
| 1385 | 1387 | # Page not synced only due to includes? |
| 1386 | 1388 | if ( !$this->article->revsArePending() ) { |