| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -148,9 +148,6 @@ |
| 149 | 149 | |
| 150 | 150 | # Can users make comments that will show up below flagged revisions? |
| 151 | 151 | $wgFlaggedRevComments = false; |
| 152 | | -# Automatically checks the 'watch' box on the review form if they set |
| 153 | | -# "watch pages I edit" as true at [[Special:Preferences]]. |
| 154 | | -$wgFlaggedRevsWatch = true; |
| 155 | 152 | # Redirect users out to review changes since stable version on save? |
| 156 | 153 | $wgReviewChangesAfterEdit = true; |
| 157 | 154 | # Auto-review edits directly to the stable version by reviewers? |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticle.php |
| — | — | @@ -617,17 +617,9 @@ |
| 618 | 618 | } |
| 619 | 619 | } |
| 620 | 620 | $form .= Xml::hidden( 'imageParams', $imageParams ) . "\n"; |
| | 621 | + |
| | 622 | + $form .= "<p>".Xml::inputLabel( wfMsg( 'revreview-log' ), 'wpReason', 'wpReason', 50 )."\n"; |
| 621 | 623 | |
| 622 | | - $watchLabel = wfMsgExt('watchthis', array('parseinline')); |
| 623 | | - $watchAttribs = array('accesskey' => wfMsg( 'accesskey-watch' ), 'id' => 'wpWatchthis'); |
| 624 | | - $watchChecked = ( $wgFlaggedRevsWatch && $wgUser->getOption( 'watchdefault' ) || $wgTitle->userIsWatching() ); |
| 625 | | - # Not much to say unless you are a validator |
| 626 | | - if( $wgUser->isAllowed( 'validate' ) ) |
| 627 | | - $form .= "<p>".Xml::inputLabel( wfMsg( 'revreview-log' ), 'wpReason', 'wpReason', 60 )."</p>\n"; |
| 628 | | - |
| 629 | | - $form .= "<p> ".Xml::check( 'wpWatchthis', $watchChecked, $watchAttribs ); |
| 630 | | - $form .= " <label for='wpWatchthis'".$skin->tooltipAndAccesskey('watch').">{$watchLabel}</label>"; |
| 631 | | - |
| 632 | 624 | $form .= ' '.Xml::submitButton( wfMsg( 'revreview-submit' ) )."</p></fieldset>"; |
| 633 | 625 | $form .= Xml::closeElement( 'form' ); |
| 634 | 626 | |
| Index: trunk/extensions/FlaggedRevs/Language/FlaggedRevsPage.i18n.en.php |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | 'revreview-style-2' => 'Good', |
| 110 | 110 | 'revreview-style-3' => 'Concise', |
| 111 | 111 | 'revreview-style-4' => 'Featured', |
| 112 | | - 'revreview-log' => 'Log comment:', |
| | 112 | + 'revreview-log' => 'Comment:', |
| 113 | 113 | 'revreview-submit' => 'Submit review', |
| 114 | 114 | 'revreview-changed' => '\'\'\'The requestion action could not be performed on this revision.\'\'\' |
| 115 | 115 | |
| Index: trunk/extensions/FlaggedRevs/FlaggedRevsPage.php |
| — | — | @@ -62,14 +62,11 @@ |
| 63 | 63 | $wgOut->permissionRequired( 'badaccess-group0' ); |
| 64 | 64 | return; |
| 65 | 65 | } |
| 66 | | - // Watch checkbox |
| 67 | | - $this->watchThis = $wgRequest->getCheck( 'wpWatchthis' ); |
| 68 | 66 | // Special parameter mapping |
| 69 | 67 | $this->templateParams = $wgRequest->getVal( 'templateParams' ); |
| 70 | 68 | $this->imageParams = $wgRequest->getVal( 'imageParams' ); |
| 71 | 69 | // Log comment |
| 72 | | - $this->comment = $wgUser->isAllowed('validate') ? |
| 73 | | - $wgRequest->getText( 'wpReason' ) : ''; |
| | 70 | + $this->comment = $wgRequest->getText( 'wpReason' ); |
| 74 | 71 | // Additional notes (displayed at bottom of page) |
| 75 | 72 | $this->notes = (FlaggedRevs::allowComments() && $wgUser->isAllowed('validate')) ? |
| 76 | 73 | $wgRequest->getText('wpNotes') : ''; |
| — | — | @@ -222,9 +219,8 @@ |
| 223 | 220 | "</textarea>" . |
| 224 | 221 | "</fieldset>"; |
| 225 | 222 | } |
| 226 | | - // Not much to say unless you are a validator |
| 227 | | - if( $wgUser->isAllowed( 'validate' ) ) |
| 228 | | - $form .= '<p>'.Xml::inputLabel( wfMsg( 'revreview-log' ), 'wpReason', 'wpReason', 60 ).'</p>'; |
| | 223 | + |
| | 224 | + $form .= '<p>'.Xml::inputLabel( wfMsg( 'revreview-log' ), 'wpReason', 'wpReason', 60 ).'</p>'; |
| 229 | 225 | |
| 230 | 226 | $form .= '<p>'.Xml::submitButton( wfMsg( 'revreview-submit' ) ).'</p>'; |
| 231 | 227 | |
| — | — | @@ -288,11 +284,6 @@ |
| 289 | 285 | $this->approveRevision( $rev, $this->notes ) : $this->unapproveRevision( $frev ); |
| 290 | 286 | // Return to our page |
| 291 | 287 | if( $success ) { |
| 292 | | - if( $this->watchThis ) { |
| 293 | | - $wgUser->addWatch( $this->page ); |
| 294 | | - } else { |
| 295 | | - $wgUser->removeWatch( $this->page ); |
| 296 | | - } |
| 297 | 288 | $wgOut->redirect( $this->page->getFullUrl() ); |
| 298 | 289 | } else { |
| 299 | 290 | $wgOut->showErrorPage( 'internalerror', 'revreview-changed' ); |
| — | — | @@ -305,7 +296,7 @@ |
| 306 | 297 | * @param string $notes |
| 307 | 298 | */ |
| 308 | 299 | function approveRevision( $rev, $notes='' ) { |
| 309 | | - global $wgUser, $wgFlaggedRevsWatch, $wgParser; |
| | 300 | + global $wgUser, $wgParser; |
| 310 | 301 | // Get the page this corresponds to |
| 311 | 302 | $title = $rev->getTitle(); |
| 312 | 303 | |
| — | — | @@ -445,7 +436,7 @@ |
| 446 | 437 | * Removes flagged revision data for this page/id set |
| 447 | 438 | */ |
| 448 | 439 | function unapproveRevision( $row ) { |
| 449 | | - global $wgUser, $wgParser, $wgFlaggedRevsWatch; |
| | 440 | + global $wgUser, $wgParser; |
| 450 | 441 | |
| 451 | 442 | $user = $wgUser->getId(); |
| 452 | 443 | |