http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84725
Revision: 84725
Author: aaron
Date: 2011-03-25 01:56:18 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
* Fixed b/c in r84170 for $wgFlaggedRevsAutoreviewNew
* Unbroke two lines
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2011-03-25 01:52:22 UTC
(rev 84724)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2011-03-25 01:56:18 UTC
(rev 84725)
@@ -110,19 +110,22 @@
self::$reviewNamespaces = $wgFlaggedRevsNamespaces;
# Note: reviewable *pages* override patrollable ones
self::$patrolNamespaces = $wgFlaggedRevsPatrolNamespaces;
- # B/C for $wgFlaggedRevsAutoReview
+ # Handle $wgFlaggedRevsAutoReview settings
global $wgFlaggedRevsAutoReview, $wgFlaggedRevsAutoReviewNew;
if ( is_int( $wgFlaggedRevsAutoReview ) ) {
self::$autoReviewConfig = $wgFlaggedRevsAutoReview;
- } else {
+ } else { // b/c
if ( $wgFlaggedRevsAutoReview ) {
- self::$autoReviewConfig |=
FR_AUTOREVIEW_CHANGES; // b/c
+ self::$autoReviewConfig = FR_AUTOREVIEW_CHANGES;
}
- if ( $wgFlaggedRevsAutoReviewNew ) {
- self::$autoReviewConfig |=
FR_AUTOREVIEW_CREATION; // b/c
- }
- wfWarn( '$wgFlaggedRevsAutoReview is now a bitfield
instead of a boolean. $wgFlaggedRevsAutoReviewNew is deprecated.' );
+ wfWarn( '$wgFlaggedRevsAutoReview is now a bitfield
instead of a boolean.' );
}
+ if ( isset( $wgFlaggedRevsAutoReviewNew ) ) { // b/c
+ self::$autoReviewConfig = ( $wgFlaggedRevsAutoReviewNew
)
+ ? self::$autoReviewConfig |=
FR_AUTOREVIEW_CREATION
+ : self::$autoReviewConfig &
~FR_AUTOREVIEW_CREATION;
+ wfWarn( '$wgFlaggedRevsAutoReviewNew is deprecated; use
$wgFlaggedRevsAutoReview.' );
+ }
}
# ################ Basic config accessors #################
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2011-03-25 01:52:22 UTC
(rev 84724)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2011-03-25 01:56:18 UTC
(rev 84725)
@@ -394,10 +394,8 @@
}
public static function onLanguageGetMagic( &$magicWords, $langCode ) {
- $magicWords['pagesusingpendingchanges'] =
- array( 0, 'pagesusingpendingchanges' );
- $magicWords['pendingchangelevel'] =
- array( 0, 'pendingchangelevel' );
+ $magicWords['pagesusingpendingchanges'] = array( 0,
'pagesusingpendingchanges' );
+ $magicWords['pendingchangelevel'] = array( 0,
'pendingchangelevel' );
return true;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
