| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -100,8 +100,6 @@ |
| 101 | 101 | |
| 102 | 102 | # Can users make comments that will show up below flagged revisions? |
| 103 | 103 | $wgFlaggedRevsComments = false; |
| 104 | | -# Redirect users out to review changes since stable version on save? |
| 105 | | -$wgReviewChangesAfterEdit = true; |
| 106 | 104 | # Allow auto-review edits directly to the stable version by reviewers? |
| 107 | 105 | # 1 to allow auto-sighting; 2 for auto-quality; 3 for auto-pristine |
| 108 | 106 | $wgFlaggedRevsAutoReview = 1; |
| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php |
| — | — | @@ -138,15 +138,6 @@ |
| 139 | 139 | global $wgUser, $wgSimpleFlaggedRevsUI; |
| 140 | 140 | return $wgUser->getOption( 'flaggedrevssimpleui', intval($wgSimpleFlaggedRevsUI) ); |
| 141 | 141 | } |
| 142 | | - |
| 143 | | - /** |
| 144 | | - * Redirect users out to review changes since stable version on save? |
| 145 | | - * @returns bool |
| 146 | | - */ |
| 147 | | - public static function reviewAfterEdit() { |
| 148 | | - global $wgReviewChangesAfterEdit; |
| 149 | | - return (bool)$wgReviewChangesAfterEdit; |
| 150 | | - } |
| 151 | 142 | |
| 152 | 143 | /** |
| 153 | 144 | * Allow auto-review edits directly to the stable version by reviewers? |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1268,9 +1268,9 @@ |
| 1269 | 1269 | return true; |
| 1270 | 1270 | # Get latest revision Id (lag safe) |
| 1271 | 1271 | $latest = $this->article->getTitle()->getLatestRevID(GAID_FOR_UPDATE); |
| 1272 | | - // If we are supposed to review after edit, and it was not autoreviewed, |
| 1273 | | - // and the user can actually make new stable version, take us to the diff... |
| 1274 | | - if( FlaggedRevs::reviewAfterEdit() && $latest > $frev->getRevId() && $frev->userCanSetFlags() ) { |
| | 1272 | + // If the edit was not autoreviewed, and the user can actually make a |
| | 1273 | + // new stable version, then go to the diff... |
| | 1274 | + if( $latest > $frev->getRevId() && $frev->userCanSetFlags() ) { |
| 1275 | 1275 | $extraQuery .= $extraQuery ? '&' : ''; |
| 1276 | 1276 | $extraQuery .= "oldid={$frev->getRevId()}&diff=cur&diffonly=0"; // override diff-only |
| 1277 | 1277 | // ...otherwise, go to the current revision after completing an edit. |