Merge "Simplify if statement logic"

This commit is contained in:
jenkins-bot 2014-09-11 01:34:54 +00:00 committed by Gerrit Code Review
commit b90936ca87

View file

@ -41,8 +41,7 @@ class PopupsHooks {
public static function onBeforePageDisplay( OutputPage &$out, Skin &$skin) { 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. // 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. // Will only be loaded if PageImages & TextExtracts extensions are installed.
if ( ( ( class_exists( 'BetaFeatures' ) && BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) ) if ( ( !class_exists( 'BetaFeatures' ) || BetaFeatures::isFeatureEnabled( $skin->getUser(), 'popups' ) )
|| !class_exists( 'BetaFeatures' ) )
&& class_exists( 'ApiQueryExtracts' ) && class_exists( 'ApiQueryExtracts' )
&& class_exists( 'ApiQueryPageImages' ) && class_exists( 'ApiQueryPageImages' )
) { ) {