| Index: trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php |
| — | — | @@ -1079,9 +1079,9 @@ |
| 1080 | 1080 | } |
| 1081 | 1081 | # Get the revision being displayed |
| 1082 | 1082 | $rev = false; |
| 1083 | | - if ( $this->reviewFormRev ) { |
| | 1083 | + if ( $this->reviewFormRev ) { // diff |
| 1084 | 1084 | $rev = $this->reviewFormRev; // $newRev for diffs stored here |
| 1085 | | - } elseif ( $this->out->getRevisionId() ) { |
| | 1085 | + } elseif ( $this->out->getRevisionId() ) { // page view |
| 1086 | 1086 | $rev = Revision::newFromId( $this->out->getRevisionId() ); |
| 1087 | 1087 | } |
| 1088 | 1088 | # Build the review form as needed |
| — | — | @@ -1387,6 +1387,9 @@ |
| 1388 | 1388 | return true; |
| 1389 | 1389 | } |
| 1390 | 1390 | $srev = $this->article->getStableRev(); |
| | 1391 | + if ( $srev && $this->isReviewableDiff ) { |
| | 1392 | + $this->reviewFormRev = $newRev; |
| | 1393 | + } |
| 1391 | 1394 | # Check if this is a diff-to-stable. If so: |
| 1392 | 1395 | # (a) prompt reviewers to review the changes |
| 1393 | 1396 | # (b) list template/file changes if only includes are pending |
| — | — | @@ -1395,7 +1398,6 @@ |
| 1396 | 1399 | && !$this->article->stableVersionIsSynced() ) // pending changes |
| 1397 | 1400 | { |
| 1398 | 1401 | $changeText = ''; |
| 1399 | | - $this->reviewFormRev = $newRev; |
| 1400 | 1402 | $changeList = array(); |
| 1401 | 1403 | # Page not synced only due to includes? |
| 1402 | 1404 | if ( !$this->article->revsArePending() ) { |