| Index: trunk/extensions/FlaggedRevs/frontend/FlaggablePageView.php |
| — | — | @@ -933,9 +933,9 @@ |
| 934 | 934 | # Find out revision id of base version |
| 935 | 935 | $latestId = $this->article->getLatest(); |
| 936 | 936 | $revId = $editPage->oldid ? $editPage->oldid : $latestId; |
| 937 | | - # Let new users know about review procedure a tag. |
| 938 | | - # If the log excerpt was shown this is redundant. |
| 939 | | - if ( !$log && !$reqUser->getId() && $this->article->isStableShownByDefault() ) { |
| | 937 | + # Let users know if their edit will have to be reviewed. |
| | 938 | + # Note: if the log excerpt was shown then this is redundant. |
| | 939 | + if ( !$log && $this->editWillRequireReview( $editPage ) ) { |
| 940 | 940 | $items[] = wfMsgExt( 'revreview-editnotice', 'parseinline' ); |
| 941 | 941 | } |
| 942 | 942 | # Add a notice if there are pending edits... |
| — | — | @@ -1745,10 +1745,10 @@ |
| 1746 | 1746 | * @return bool |
| 1747 | 1747 | */ |
| 1748 | 1748 | protected function editWillRequireReview( EditPage $editPage ) { |
| 1749 | | - $request = $this->getRequest(); |
| | 1749 | + $request = $this->getRequest(); // convenience |
| 1750 | 1750 | $title = $this->article->getTitle(); // convenience |
| 1751 | 1751 | if ( !$this->editRequiresReview( $editPage ) ) { |
| 1752 | | - return false; // edit will go live immediatly |
| | 1752 | + return false; // edit will go live immediately |
| 1753 | 1753 | } elseif ( $request->getCheck( 'wpReviewEdit' ) && $title->userCan( 'review' ) ) { |
| 1754 | 1754 | return false; // edit checked off to be reviewed on save |
| 1755 | 1755 | } |
| — | — | @@ -1780,7 +1780,7 @@ |
| 1781 | 1781 | if ( !$this->article->isReviewable() ) { |
| 1782 | 1782 | return false; |
| 1783 | 1783 | } |
| 1784 | | - if ( $title->userCan( 'autoreview' ) ) { |
| | 1784 | + if ( $title->quickUserCan( 'autoreview' ) ) { |
| 1785 | 1785 | if ( FlaggedRevs::autoReviewNewPages() && !$this->article->exists() ) { |
| 1786 | 1786 | return true; // edit will be autoreviewed |
| 1787 | 1787 | } |
| Index: trunk/extensions/FlaggedRevs/frontend/language/FlaggedRevs.i18n.php |
| — | — | @@ -98,10 +98,10 @@ |
| 99 | 99 | 'revreview-depth-4' => 'Featured', |
| 100 | 100 | 'revreview-draft-title' => 'Pending changes are displayed on this page', |
| 101 | 101 | 'revreview-edit' => 'Edit', |
| 102 | | - 'revreview-editnotice' => '\'\'\'Your changes will be displayed to readers once an authorized user reviews them. ([[{{MediaWiki:Validationpage}}|help]])\'\'\'', |
| | 102 | + 'revreview-editnotice' => '\'\'\'Your changes will be displayed to readers once an authorized user accepts them. ([[{{MediaWiki:Validationpage}}|help]])\'\'\'', |
| 103 | 103 | 'revreview-submitedit' => 'Submit changes', |
| 104 | 104 | 'revreview-submitedit-title' => 'Submit your changes for review', |
| 105 | | - 'revreview-edited' => '\'\'\'Your changes will be displayed to readers once an authorized user reviews them. ([[{{MediaWiki:Validationpage}}|help]])\'\'\' |
| | 105 | + 'revreview-edited' => '\'\'\'Your changes will be displayed to readers once an authorized user accepts them. ([[{{MediaWiki:Validationpage}}|help]])\'\'\' |
| 106 | 106 | |
| 107 | 107 | There {{PLURAL:$2|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur{{MediaWiki:flaggedrevs-diffonly}}}} $2 pending {{PLURAL:$2|change|changes}}] \'\'(shown below)\'\' awaiting review.', |
| 108 | 108 | 'revreview-edited-section' => 'Return to page section named "[[#$1|$2]]".', |