aaron at svn
May 11, 2008, 6:14 AM
Post #1 of 1
(16 views)
Permalink
|
|
SVN: [34611] trunk/extensions/FlaggedRevs
|
|
Revision: 34611
Author: aaron
Date: 2008-05-11 13:14:23 +0000 (Sun, 11 May 2008)
Log Message:
-----------
* Fix constant
* Pass page_id to getRevisionTags()
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedArticle.php
trunk/extensions/FlaggedRevs/FlaggedRevs.php
trunk/extensions/FlaggedRevs/FlaggedRevsPage.php
Modified: trunk/extensions/FlaggedRevs/FlaggedArticle.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedArticle.php 2008-05-11 11:23:52 UTC (rev 34610)
+++ trunk/extensions/FlaggedRevs/FlaggedArticle.php 2008-05-11 13:14:23 UTC (rev 34611)
@@ -969,7 +969,7 @@
if( isset($this->flags[$rev_id]) && $this->flags[$rev_id] )
return $this->flags[$rev_id];
# Get the flags
- $flags = FlaggedRevs::getRevisionTags( $rev_id );
+ $flags = FlaggedRevs::getRevisionTags( $this->getTitle(), $rev_id );
# Try to cache results
$this->flags[$rev_id] = $flags;
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php 2008-05-11 11:23:52 UTC (rev 34610)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php 2008-05-11 13:14:23 UTC (rev 34611)
@@ -858,10 +858,11 @@
* @param int $rev_id
* @return Array
*/
- public static function getRevisionTags( $rev_id ) {
+ public static function getRevisionTags( $article, $rev_id ) {
$dbr = wfGetDB( DB_SLAVE );
$tags = $dbr->selectField( 'flaggedrevs', 'fr_tags',
- array('fr_rev_id' => $rev_id ),
+ array( 'fr_rev_id' => $rev_id,
+ 'fr_page_id' => $article->getId() ),
__METHOD__ );
if( !$tags )
return false;
@@ -1765,7 +1766,7 @@
return true;
# GetTitle() for revisions uses slaves and wants page_id,rev_id to
# match...this is bad if we *just* added it.
- $title = $rev->getTitle() ? $rev->getTitle() : Title::newFromID( $rev->getPage(), FOR_UPDATE );
+ $title = $rev->getTitle() ? $rev->getTitle() : Title::newFromID( $rev->getPage(), GAID_FOR_UPDATE );
# Must be in reviewable namespace
if( !$title || !self::isPageReviewable( $title ) ) {
return true;
Modified: trunk/extensions/FlaggedRevs/FlaggedRevsPage.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevsPage.php 2008-05-11 11:23:52 UTC (rev 34610)
+++ trunk/extensions/FlaggedRevs/FlaggedRevsPage.php 2008-05-11 13:14:23 UTC (rev 34611)
@@ -83,7 +83,7 @@
$this->notes = ( FlaggedRevs::allowComments() && $wgUser->isAllowed('validate') ) ?
$wgRequest->getText('wpNotes') : '';
# Get the revision's current flags, if any
- $this->oflags = FlaggedRevs::getRevisionTags( $this->oldid );
+ $this->oflags = FlaggedRevs::getRevisionTags( $this->page, $this->oldid );
# Get our accuracy/quality dimensions
$this->dims = array();
$this->unapprovedTags = 0;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
