| Index: branches/wmf/1.17wmf1/extensions/CodeReview/CodeReview.i18n.php |
| — | — | @@ -232,7 +232,7 @@ |
| 233 | 233 | 'right-codereview-signoff' => 'Sign off on revisions', |
| 234 | 234 | 'right-codereview-link-user' => 'Link authors to wiki users', |
| 235 | 235 | 'right-codereview-associate' => 'Manage revision associations', |
| 236 | | - 'right-codereview-review-own' => 'Mark your own revisions as OK', |
| | 236 | + 'right-codereview-review-own' => 'Mark your own revisions as OK or Resolved', |
| 237 | 237 | |
| 238 | 238 | 'specialpages-group-developer' => 'Developer tools', |
| 239 | 239 | |
| Index: branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php |
| — | — | @@ -282,10 +282,10 @@ |
| 283 | 283 | throw new MWException( "Tried to save invalid code revision status" ); |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | | - // Don't allow the user account tied to the committer account mark their own revisions as ok |
| | 286 | + // Don't allow the user account tied to the committer account mark their own revisions as ok/resolved |
| 287 | 287 | // Obviously only works if user accounts are tied! |
| 288 | 288 | $wikiUser = $this->getWikiUser(); |
| 289 | | - if ( $status == 'ok' && $wikiUser && $user->getName() == $wikiUser->getName() ) { |
| | 289 | + if ( ( $status == 'ok' || $status == 'resolved' ) && $wikiUser && $user->getName() == $wikiUser->getName() ) { |
| 290 | 290 | // allow the user to review their own code if required |
| 291 | 291 | if ( !$wikiUser->isAllowed( 'codereview-review-own' ) ) { |
| 292 | 292 | return false; |
| Property changes on: branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 293 | 293 | Merged /trunk/extensions/CodeReview/backend/CodeRevision.php:r93108-93109 |