| Index: trunk/extensions/FlaggedRevs/maintenance/reviewAllPages.inc |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | $title = Title::makeTitle( $row->page_namespace, $row->page_title ); |
| 35 | 35 | $rev = Revision::newFromId( $row->page_latest ); |
| 36 | 36 | # Is it already reviewed? |
| 37 | | - $frev = FlaggedRevision::newFromTitle( $title, $row->page_latest, FR_FOR_UPDATE ); |
| | 37 | + $frev = FlaggedRevision::newFromTitle( $title, $row->page_latest, FR_MASTER ); |
| 38 | 38 | # Should exist, but to be safe... |
| 39 | 39 | if( !$frev && $rev && FlaggedRevs::isPageReviewable($title) ) { |
| 40 | 40 | $text = $rev->getText(); |
| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php |
| — | — | @@ -333,7 +333,7 @@ |
| 334 | 334 | $qal = min($wgFlaggedRevsAutoReview-1,$quality); |
| 335 | 335 | # Pristine auto-review? |
| 336 | 336 | if( $qal == FR_PRISTINE ) { |
| 337 | | - $flags = self::quickPristineTags(); |
| | 337 | + $flags = self::quickTags( FR_PRISTINE ); |
| 338 | 338 | # If tags are available and user can set them, we are done... |
| 339 | 339 | if( RevisionReview::userCanSetFlags( $flags, array(), $config ) ) { |
| 340 | 340 | return $flags; |
| — | — | @@ -342,7 +342,7 @@ |
| 343 | 343 | } |
| 344 | 344 | # Quality auto-review? |
| 345 | 345 | if( $qal == FR_QUALITY ) { |
| 346 | | - $flags = self::quickQualityTags(); |
| | 346 | + $flags = self::quickTags( FR_QUALITY ); |
| 347 | 347 | # If tags are available and user can set them, we are done... |
| 348 | 348 | if( RevisionReview::userCanSetFlags( $flags, array(), $config ) ) { |
| 349 | 349 | return $flags; |
| — | — | @@ -351,7 +351,7 @@ |
| 352 | 352 | } |
| 353 | 353 | # Sighted auto-review? |
| 354 | 354 | if( $qal == FR_SIGHTED ) { |
| 355 | | - $flags = self::quickSightedTags(); |
| | 355 | + $flags = self::quickTags( FR_SIGHTED ); |
| 356 | 356 | # If tags are available and user can set them, we are done... |
| 357 | 357 | if( RevisionReview::userCanSetFlags( $flags, array(), $config ) ) { |
| 358 | 358 | return $flags; |
| — | — | @@ -1413,7 +1413,7 @@ |
| 1414 | 1414 | |
| 1415 | 1415 | # If we know that this is now the new stable version |
| 1416 | 1416 | # (which it probably is), save it to the cache... |
| 1417 | | - $sv = FlaggedRevision::newFromStable( $article->getTitle(), FR_FOR_UPDATE/*consistent*/ ); |
| | 1417 | + $sv = FlaggedRevision::newFromStable( $article->getTitle(), FR_MASTER/*consistent*/ ); |
| 1418 | 1418 | if( $sv && $sv->getRevId() == $rev->getId() ) { |
| 1419 | 1419 | # Update stable cache |
| 1420 | 1420 | self::updatePageCache( $article, $poutput ); |
| Index: trunk/extensions/FlaggedRevs/FlaggedRevision.php |
| — | — | @@ -69,7 +69,7 @@ |
| 70 | 70 | # User master/slave as appropriate |
| 71 | 71 | if( $flags & FR_FOR_UPDATE || $flags & FR_MASTER ) { |
| 72 | 72 | $db = wfGetDB( DB_MASTER ); |
| 73 | | - if( $flags & FR_FOR_UPDATE ) $options[] = 'LOCK IN SHARE MODE'; |
| | 73 | + if( $flags & FR_FOR_UPDATE ) $options[] = 'FOR UPDATE'; |
| 74 | 74 | } else { |
| 75 | 75 | $db = wfGetDB( DB_SLAVE ); |
| 76 | 76 | } |
| — | — | @@ -140,7 +140,7 @@ |
| 141 | 141 | } |
| 142 | 142 | $dbw = wfGetDB( DB_MASTER ); |
| 143 | 143 | $options['ORDER BY'] = 'fr_rev_id DESC'; |
| 144 | | - if( $flags & FR_FOR_UPDATE ) $options[] = 'LOCK IN SHARE MODE'; |
| | 144 | + if( $flags & FR_FOR_UPDATE ) $options[] = 'FOR UPDATE'; |
| 145 | 145 | # Look for the latest pristine revision... |
| 146 | 146 | if( FlaggedRevs::pristineVersions() && $config['select'] != FLAGGED_VIS_LATEST ) { |
| 147 | 147 | $prow = $dbw->selectRow( array('flaggedrevs','revision'), |
| Index: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php |
| — | — | @@ -643,7 +643,7 @@ |
| 644 | 644 | $u = new LinksUpdate( $this->page, $poutput ); |
| 645 | 645 | # If we know that this is now the new stable version |
| 646 | 646 | # (which it probably is), save it to the stable cache... |
| 647 | | - $sv = FlaggedRevision::newFromStable( $this->page, FR_FOR_UPDATE/*consistent*/ ); |
| | 647 | + $sv = FlaggedRevision::newFromStable( $this->page, FR_MASTER/*consistent*/ ); |
| 648 | 648 | if( $sv && $sv->getRevId() == $rev->getId() ) { |
| 649 | 649 | global $wgParserCacheExpireTime; |
| 650 | 650 | $this->page->invalidateCache(); |