http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73447
Revision: 73447
Author: aaron
Date: 2010-09-21 04:12:55 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
* Reduced places where reject button shows up (old rev must be the stable)
* Made hooks ignore backwards (newer/older) diffs
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedArticleView.php
trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
Modified: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-09-21 03:37:39 UTC
(rev 73446)
+++ trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-09-21 04:12:55 UTC
(rev 73447)
@@ -1532,7 +1532,8 @@
*/
public function setViewFlags( $diff, $oldRev, $newRev ) {
$this->load();
- if ( $newRev && $oldRev ) {
+ // We only want valid diffs that actually make sense...
+ if ( $newRev && $oldRev && $newRev->getTimestamp() >=
$oldRev->getTimestamp() ) {
// Is this a diff between two pages?
if ( $newRev->getPage() != $oldRev->getPage() ) {
$this->isMultiPageDiff = true;
Modified: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php 2010-09-21
03:37:39 UTC (rev 73446)
+++ trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php 2010-09-21
04:12:55 UTC (rev 73447)
@@ -738,17 +738,20 @@
$form .= Xml::openElement( 'span', array( 'style' =>
'white-space: nowrap;' ) );
# Hide comment input if needed
if ( !$disabled ) {
- if ( count( FlaggedRevs::getDimensions() ) > 1 )
+ if ( count( FlaggedRevs::getDimensions() ) > 1 ) {
$form .= "<br />"; // Don't put too much on one
line
+ }
$form .= "<span id='mw-fr-commentbox'
style='clear:both'>" .
Xml::inputLabel( wfMsg( 'revreview-log' ),
'wpReason', 'wpReason', 35, '',
array( 'class' => 'fr-comment-box' ) )
. "   </span>";
}
+ # Determine if there will be reject button
+ $rejectId = 0;
+ if ( $refId == $article->getStable() && $id != $refId ) {
+ $rejectId = $refId; // left rev must be stable and
right one newer
+ }
# Add the submit buttons
- if ( $rev->getId() == $refId ) {
- $refId = 0; // revisions are the same => can't reject
- }
- $form .= self::submitButtons( $refId, $frev, (bool)$disabled,
$reviewIncludes );
+ $form .= self::submitButtons( $rejectId, $frev,
(bool)$disabled, $reviewIncludes );
# Show stability log if there is anything interesting...
if ( $article->isPageLocked() ) {
$form .= ' ' . FlaggedRevsXML::logToggle(
'revreview-log-toggle-show' );
@@ -898,13 +901,15 @@
/**
* Generates review form submit buttons
- * @param int $refId left rev ID for "reject" on diffs
+ * @param int $rejectId left rev ID for "reject" on diffs
* @param FlaggedRevision $frev, the flagged revision, if any
* @param bool $disabled, is the form disabled?
* @param bool $reviewIncludes, force the review button to be usable?
* @returns string
*/
- private static function submitButtons( $refId, $frev, $disabled,
$reviewIncludes = false ) {
+ private static function submitButtons(
+ $rejectId, $frev, $disabled, $reviewIncludes = false
+ ) {
$disAttrib = array( 'disabled' => 'disabled' );
# ACCEPT BUTTON: accept a revision
# We may want to re-review to change:
@@ -926,7 +931,7 @@
) + ( ( $disabled || !$applicable ) ? $disAttrib :
array() )
);
# REJECT BUTTON: revert from a pending revision to the stable
- if ( $refId ) {
+ if ( $rejectId ) {
$s .= ' ';
$s .= Xml::submitButton( wfMsgHtml(
'revreview-submit-reject' ),
array(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
