| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php |
| — | — | @@ -1626,7 +1626,7 @@ |
| 1627 | 1627 | $preferences['flaggedrevsviewdiffs'] = |
| 1628 | 1628 | array( |
| 1629 | 1629 | 'type' => 'toggle', |
| 1630 | | - 'section' => 'misc/diffs', |
| | 1630 | + 'section' => 'flaggedrevs/flaggedrevs-ui', |
| 1631 | 1631 | 'label-message' => 'flaggedrevs-prefs-viewdiffs', |
| 1632 | 1632 | ); |
| 1633 | 1633 | } |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1557,12 +1557,13 @@ |
| 1558 | 1558 | */ |
| 1559 | 1559 | public function addReviewCheck( EditPage $editPage, array &$checkboxes, &$tabindex ) { |
| 1560 | 1560 | global $wgUser, $wgRequest; |
| 1561 | | - if ( !$this->article->isReviewable() || !$wgUser->isAllowed( 'review' ) ) { |
| 1562 | | - return true; |
| 1563 | | - } elseif ( FlaggedRevs::autoReviewNewPages() && !$this->article->exists() ) { |
| | 1561 | + if ( !$wgUser->isAllowed( 'review' ) |
| | 1562 | + || !$this->article->isReviewable() |
| | 1563 | + || !$this->article->revsArePending() ) |
| | 1564 | + { |
| 1564 | 1565 | return true; // not needed |
| 1565 | 1566 | } |
| 1566 | | - $oldid = $wgRequest->getInt( 'oldid', $this->article->getLatest() ); |
| | 1567 | + $oldid = $wgRequest->getInt( 'baseRevId', $this->article->getLatest() ); |
| 1567 | 1568 | if ( $oldid == $this->article->getLatest() ) { |
| 1568 | 1569 | $srev = $this->article->getStableRev(); |
| 1569 | 1570 | # For pages with either no stable version, or an outdated one, let |