Jackmcbarn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/159654

Change subject: Simplify if statement logic
......................................................................

Simplify if statement logic

"(A and B) or ~A" is the same as "~A or B", so use the latter.

Change-Id: Ic2eb3eed31b311070f895e05523df433dea11579
---
M Popups.hooks.php
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/54/159654/1

diff --git a/Popups.hooks.php b/Popups.hooks.php
index 0070376..ccb92c7 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -41,8 +41,7 @@
        public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin) {
                // Enable only if the user has turned it on in Beta 
Preferences, or BetaFeatures is not installed.
                // Will only be loaded if PageImages & TextExtracts extensions 
are installed.
-               if ( ( ( class_exists( 'BetaFeatures' ) && 
BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
-                               || !class_exists( 'BetaFeatures' ) )
+               if ( ( !class_exists( 'BetaFeatures' ) || 
BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
                        && class_exists( 'ApiQueryExtracts' )
                        && class_exists( 'ApiQueryPageImages' )
                ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/159654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2eb3eed31b311070f895e05523df433dea11579
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn <jackmcb...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to