aaron at svn
Oct 11, 2009, 2:02 PM
Post #1 of 1
(171 views)
Permalink
|
|
SVN: [57648] trunk/extensions/FlaggedRevs
|
|
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/57648
Revision: 57648
Author: aaron
Date: 2009-10-11 21:02:36 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Minor cleanups & comments
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedArticle.php
trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
Modified: trunk/extensions/FlaggedRevs/FlaggedArticle.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedArticle.php 2009-10-11 20:49:08 UTC (rev 57647)
+++ trunk/extensions/FlaggedRevs/FlaggedArticle.php 2009-10-11 21:02:36 UTC (rev 57648)
@@ -1440,18 +1440,18 @@
*/
public function addQuickReview( &$data, $top = false, $hide = false ) {
global $wgOut, $wgUser, $wgRequest;
- # Revision being displayed
+ # Get the revision being displayed
$id = $wgOut->getRevisionId();
if( !$id ) {
if( !$this->isDiffFromStable ) {
return false; // only safe to assume current if diff-to-stable
+ } else {
+ $rev = Revision::newFromTitle( $this->parent->getTitle() );
+ $id = $rev->getId();
}
- $rev = Revision::newFromTitle( $this->parent->getTitle() );
- $id = $rev->getId();
} else {
$rev = Revision::newFromTitle( $this->parent->getTitle(), $id );
}
-
# Load required messages
wfLoadExtensionMessages( 'FlaggedRevs' );
# Must be a valid non-printable output and revision must be public
@@ -1587,15 +1587,15 @@
Xml::closeElement('textarea') . "\n";
$form .= "</div>\n";
}
-
+ # Get versions of templates/files used
$imageParams = $templateParams = $fileVersion = '';
if( $useCurrent ) {
- global $wgUser, $wgParser, $wgEnableParserCache;
# Get parsed current version
$parserCache = ParserCache::singleton();
$article = $this->parent;
$currentOutput = $parserCache->get( $article, $wgUser );
- if( $currentOutput==false ) {
+ if( $currentOutput == false ) {
+ global $wgParser, $wgEnableParserCache;
$text = $article->getContent();
$title = $article->getTitle();
$options = FlaggedRevs::makeParserOptions();
Modified: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php 2009-10-11 20:49:08 UTC (rev 57647)
+++ trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php 2009-10-11 21:02:36 UTC (rev 57648)
@@ -809,7 +809,7 @@
if( !self::userCan($qal,$level,$config) ) {
return false; // user cannot set proposed flag
} elseif( isset($oldflags[$qal]) && !self::userCan($qal,$oldflags[$qal]) ) {
- return false; // user cannot change old flag
+ return false; // user cannot change old flag ($config is ignored here)
} elseif( $level < 0 || $level > $highest ) {
return false; // flag range is invalid
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
