http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76229
Revision: 76229
Author: aaron
Date: 2010-11-07 02:58:53 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
* Fix fatals from r75973 (in for loops)
* Used simpler getTags() instead of getDimensions() in other places too
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevision.php
trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
trunk/extensions/FlaggedRevs/FlaggedRevsXML.php
trunk/extensions/FlaggedRevs/api/ApiReview.php
trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevision.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-11-07 00:58:31 UTC
(rev 76228)
+++ trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-11-07 02:58:53 UTC
(rev 76229)
@@ -741,7 +741,7 @@
public static function expandRevisionTags( $tags ) {
# Set all flags to zero
$flags = array();
- foreach ( FlaggedRevs::getDimensions() as $tag => $levels ) {
+ foreach ( FlaggedRevs::getTags() as $tag ) {
$flags[$tag] = 0;
}
$tags = str_replace( '\n', "\n", $tags ); // B/C, old broken
rows
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2010-11-07 00:58:31 UTC
(rev 76228)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2010-11-07 02:58:53 UTC
(rev 76229)
@@ -1187,7 +1187,7 @@
$minLevels = self::$minSL;
}
$flags = array();
- foreach ( self::getDimensions() as $tag => $x ) {
+ foreach ( self::getTags() as $tag ) {
$flags[$tag] = $minLevels[$tag];
}
return $flags;
@@ -1205,7 +1205,7 @@
return null; // shouldn't happen
}
$flags = array();
- foreach ( self::getDimensions() as $tag => $levels ) {
+ foreach ( self::getTags() as $tag ) {
# Try to keep this tag val the same as the stable rev's
$val = isset( $oldFlags[$tag] ) ? $oldFlags[$tag] : 1;
$val = min( $val, self::maxAutoReviewLevel( $tag ) );
Modified: trunk/extensions/FlaggedRevs/FlaggedRevsXML.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2010-11-07 00:58:31 UTC
(rev 76228)
+++ trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2010-11-07 02:58:53 UTC
(rev 76229)
@@ -182,7 +182,7 @@
if ( $prettyBox ) {
$tag .= "<table id='mw-fr-revisionratings-box' align='center'
class='$css' cellpadding='0'>";
}
- foreach ( FlaggedRevs::getDimensions() as $quality ) {
+ foreach ( FlaggedRevs::getTags() as $quality ) {
$level = isset( $flags[$quality] ) ? $flags[$quality] :
0;
$encValueText = wfMsgHtml( "revreview-$quality-$level"
);
$level = $flags[$quality];
Modified: trunk/extensions/FlaggedRevs/api/ApiReview.php
===================================================================
--- trunk/extensions/FlaggedRevs/api/ApiReview.php 2010-11-07 00:58:31 UTC
(rev 76228)
+++ trunk/extensions/FlaggedRevs/api/ApiReview.php 2010-11-07 02:58:53 UTC
(rev 76229)
@@ -62,7 +62,7 @@
$form->setNotes( $params['notes'] );
// The flagging parameters have the form 'flag_$name'.
// Extract them and put the values into $form->dims
- foreach ( FlaggedRevs::getDimensions() as $tag ) {
+ foreach ( FlaggedRevs::getTags() as $tag ) {
$form->setDim( $tag, intval( $params['flag_' . $tag] )
);
}
if ( $form->isApproval() ) {
@@ -174,7 +174,7 @@
if ( FlaggedRevs::dimensionsEmpty() ) {
$desc['unapprove'] = "If set, revision will be
unapproved rather than approved.";
} else {
- foreach ( FlaggedRevs::getDimensions() as $flagname ) {
+ foreach ( FlaggedRevs::getTags() as $flagname ) {
$desc['flag_' . $flagname] = "Set the flag
''{$flagname}'' to the specified value";
}
}
Modified: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php 2010-11-07
00:58:31 UTC (rev 76228)
+++ trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php 2010-11-07
02:58:53 UTC (rev 76229)
@@ -217,7 +217,7 @@
if ( $iDims ) {
$this->dims = $iDims;
} else {
- foreach ( FlaggedRevs::getDimensions() as $tag ) {
+ foreach ( FlaggedRevs::getTags() as $tag ) {
if ( $this->dims[$tag] === 0 ) {
$this->unapprovedTags++;
}
@@ -226,7 +226,7 @@
# We must at least rate each category as 1, the minimum
# Exception: we can rate ALL as unapproved to depreciate a
revision
if ( $this->unapprovedTags
- && $this->unapprovedTags < count(
FlaggedRevs::getDimensions() ) )
+ && $this->unapprovedTags < count(
FlaggedRevs::getTags() ) )
{
return 'review_too_low';
}
@@ -748,7 +748,7 @@
$form .= Xml::openElement( 'span', array( 'style' =>
'white-space: nowrap;' ) );
# Hide comment input if needed
if ( !$disabled ) {
- if ( count( FlaggedRevs::getDimensions() ) > 1 ) {
+ if ( count( FlaggedRevs::getTags() ) > 1 ) {
$form .= "<br />"; // Don't put too much on one
line
}
$form .= "<span id='mw-fr-commentbox'
style='clear:both'>" .
@@ -809,7 +809,6 @@
if ( $labels === false ) {
$disabled = true; // a tag is unsettable
}
- $dimensions = FlaggedRevs::getDimensions();
# If there are no tags, make one checkbox to approve/unapprove
if ( FlaggedRevs::binaryFlagging() ) {
return '';
@@ -818,7 +817,7 @@
# Build rating form...
if ( $disabled ) {
// Display the value for each tag as text
- foreach ( $dimensions as $quality => $levels ) {
+ foreach ( FlaggedRevs::getTags() as $quality ) {
$selected = isset( $flags[$quality] ) ?
$flags[$quality] : 0;
$items[] = FlaggedRevs::getTagMsg( $quality ) .
": " .
FlaggedRevs::getTagValueMsg( $quality,
$selected );
Modified: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
2010-11-07 00:58:31 UTC (rev 76228)
+++ trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
2010-11-07 02:58:53 UTC (rev 76229)
@@ -57,7 +57,7 @@
# Special token to discourage fiddling...
$form->setValidatedParams( $wgRequest->getVal(
'validatedParams' ) );
# Tag values
- foreach ( FlaggedRevs::getDimensions() as $tag ) {
+ foreach ( FlaggedRevs::getTags() as $tag ) {
# This can be NULL if we uncheck a checkbox
$val = $wgRequest->getInt( "wp$tag" );
$form->setDim( $tag, $val );
@@ -136,7 +136,7 @@
if ( wfReadOnly() ) {
return '<err#>' . wfMsgExt( 'revreview-failed',
'parseinline' );
}
- $tags = FlaggedRevs::getDimensions();
+ $tags = FlaggedRevs::getTags();
// Make review interface object
$form = new RevisionReviewForm( $wgUser );
$title = null; // target page
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
