jenkins-bot has submitted this change and it was merged.
Change subject: Moving wgWikiGrokDebug check from onBeforePageDisplay to
isUIEnabled
......................................................................
Moving wgWikiGrokDebug check from onBeforePageDisplay to isUIEnabled
Less redundant code.
Change-Id: I4ee168cf5aad7c409014b3bdadb548ff4084e648
---
M includes/Hooks.php
1 file changed, 3 insertions(+), 5 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 6a74059..4e8e9b0 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -25,8 +25,8 @@
*/
protected static function isUIEnabled() {
$config = self::getConfig();
- return $config->get( 'WikiGrokUIEnable')
- && ( class_exists( 'ApiCentralAuthToken' ) ||
$config->get( 'WikiGrokDebug' ) );
+ return ( $config->get( 'WikiGrokUIEnable') && class_exists(
'ApiCentralAuthToken' ) )
+ || ( $config->get( 'WikiGrokDebug' ) &&
$out->getRequest()->getText( 'wikigrokversion' ) );
}
/**
@@ -235,9 +235,7 @@
$config = self::getConfig();
$inBeta = MobileContext::singleton()->isBetaGroupMember();
- if ( self::isUIEnabled()
- || ( $config->get( 'WikiGrokDebug' ) &&
$out->getRequest()->getText( 'wikigrokversion' ) )
- ) {
+ if ( self::isUIEnabled() ) {
$out->addModules( 'ext.wikigrok.startup' );
if ( $inBeta && $config->get(
'WikiGrokUIEnableInSidebar' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/196078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ee168cf5aad7c409014b3bdadb548ff4084e648
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
