jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350008 )
Change subject: Follow-up 2b68933208: use variables
......................................................................
Follow-up 2b68933208: use variables
Make the code a bit less repetitive.
Change-Id: I5e551116ffec1a8e1f6410b0a584376d189b19fb
---
M includes/Hooks.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 859f7f6..0393990 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -831,16 +831,18 @@
*/
private static function isDamagingFlagEnabled( IContextSource $context
) {
global $wgOresExtensionStatus;
+ $isRCPage = self::isRCPage( $context );
+ $user = $context->getUser();
return $wgOresExtensionStatus === 'beta' ||
(
- self::isRCPage( $context ) &&
- $context->getUser()->getBoolOption(
'ores-damaging-flag-rc' ) &&
+ $isRCPage &&
+ $user->getBoolOption( 'ores-damaging-flag-rc' )
&&
// If rcenhancedfilters is enabled, the
ores-damaging-flag-rc preference is hidden,
// but it doesn't behave as if it's false; see
HACK comment in onGetPreferences
- !$context->getUser()->getBoolOption(
'rcenhancedfilters' )
+ !$user->getBoolOption( 'rcenhancedfilters' )
) || (
- !self::isRCPage( $context ) &&
- $context->getUser()->getBoolOption(
'oresHighlight' )
+ !$isRCPage &&
+ $user->getBoolOption( 'oresHighlight' )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/350008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e551116ffec1a8e1f6410b0a584376d189b19fb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
