| Index: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | 'revreview-diff-toggle-title' => 'Toggle display of pending changes to the published version', |
| 57 | 57 | 'revreview-log-toggle-show' => '(show stability log)', |
| 58 | 58 | 'revreview-log-details-show' => '(show details)', |
| 59 | | - 'review-diff2stable' => 'View pending changes to published version', |
| | 59 | + 'review-diff2stable' => 'View all pending changes', |
| 60 | 60 | 'review-logentry-app' => 'reviewed a version of [[$1]]', |
| 61 | 61 | 'review-logentry-dis' => 'deprecated a version of [[$1]]', |
| 62 | 62 | 'review-logentry-id' => 'revision: $2', |
| — | — | @@ -171,6 +171,9 @@ |
| 172 | 172 | |
| 173 | 173 | Please hit the "back" button in your browser and try again.', |
| 174 | 174 | 'revreview-update' => 'Please [[{{MediaWiki:Validationpage}}|review]] any pending changes \'\'(shown below)\'\' made to the published version.', |
| | 175 | + 'revreview-update-edited' => 'When you edited this page, some \'\'other\'\' edits were already pending review. |
| | 176 | + |
| | 177 | +To publish your changes, please [[{{MediaWiki:Validationpage}}|review]] \'\'all\'\' the pending changes \'\'(shown below)\'\'.', |
| 175 | 178 | 'revreview-update-includes' => '\'\'\'Some templates/files were updated:\'\'\'', |
| 176 | 179 | 'revreview-update-use' => '\'\'\'NOTE:\'\'\' The published version of each of these templates/files is used in the published version of this page.', |
| 177 | 180 | 'revreview-visibility' => '\'\'\'This page has an updated [[{{MediaWiki:Validationpage}}|published version]]; page stability settings can be [{{fullurl:{{#Special:Stabilization}}|page={{FULLPAGENAMEE}}}} configured].\'\'\'', |
| Index: trunk/extensions/FlaggedRevs/specialpages/OldReviewedPages_body.php |
| — | — | @@ -205,8 +205,8 @@ |
| 206 | 206 | |
| 207 | 207 | $title = Title::newFromRow( $row ); |
| 208 | 208 | $link = $this->skin->makeKnownLinkObj( $title ); |
| 209 | | - $hist = $this->skin->makeKnownLinkObj( $title, wfMsgHtml( 'hist' ), |
| 210 | | - 'action=history&reviewing=1' ); |
| | 209 | + $hist = $this->skin->makeKnownLinkObj( $title, |
| | 210 | + wfMsgHtml( 'hist' ), 'action=history' ); |
| 211 | 211 | $stxt = ChangesList::showCharacterDifference( $row->rev_len, $row->page_len ); |
| 212 | 212 | $review = $this->skin->makeKnownLinkObj( $title, |
| 213 | 213 | wfMsg( 'oldreviewed-diff' ), |
| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php |
| — | — | @@ -157,6 +157,7 @@ |
| 158 | 158 | return true; |
| 159 | 159 | } |
| 160 | 160 | |
| | 161 | + // Mark when an unreviewed page is being reviewed |
| 161 | 162 | public static function maybeMarkUnderReview( $article, $user, $request ) { |
| 162 | 163 | if( !$user->isAllowed( 'review' ) ) { |
| 163 | 164 | return true; // user cannot review |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1223,7 +1223,14 @@ |
| 1224 | 1224 | # Only those if there is something to actually review. |
| 1225 | 1225 | if ( $newRev->getId() > $oldRev->getId() ) { |
| 1226 | 1226 | # "Please review" notice... |
| 1227 | | - $changeDiv = wfMsgExt( 'revreview-update', 'parse' ); |
| | 1227 | + $msg = 'revreview-update'; |
| | 1228 | + if( $wgRequest->getInt( 'shownotice' ) |
| | 1229 | + && $newRev->isCurrent() |
| | 1230 | + && $newRev->getRawUserText() == $wgUser->getName() ) |
| | 1231 | + { |
| | 1232 | + $msg = 'revreview-update-edited'; // Reviewer just edited |
| | 1233 | + } |
| | 1234 | + $changeDiv = wfMsgExt( $msg, 'parse' ); |
| 1228 | 1235 | if ( count( $changeList ) ) { |
| 1229 | 1236 | # Add include change list... |
| 1230 | 1237 | $changeDiv .= '<p>' . |
| — | — | @@ -1451,7 +1458,7 @@ |
| 1452 | 1459 | if ( $frev->userCanSetFlags() ) { |
| 1453 | 1460 | $extraQuery .= $extraQuery ? '&' : ''; |
| 1454 | 1461 | // Override diffonly setting to make sure the content is shown |
| 1455 | | - $extraQuery .= 'oldid='.intval($frev->getRevId()).'&diff=cur&diffonly=0'; |
| | 1462 | + $extraQuery .= 'oldid='.$frev->getRevId().'&diff=cur&diffonly=0&shownotice=1'; |
| 1456 | 1463 | // ...otherwise, go to the current revision after completing an edit. |
| 1457 | 1464 | // This allows for users to immediately see their changes. |
| 1458 | 1465 | } else { |