X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoader.php;h=80eb5984ebbc513d96f690b7e2c3bbe47fd7253c;hb=f31e3902c928de754a553bf2e1c3f66696a05bb6;hp=43f294b9c5b0266a7e50f0365a806ba7add90ada;hpb=a0a8f165506a55c4d70ef2bb3cec4d4309ed33d8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 43f294b9c5..80eb5984eb 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -570,8 +570,7 @@ class ResourceLoader implements LoggerAwareInterface {
 	}
 
 	/**
-	 * Return whether the definition of a module corresponds to a simple ResourceLoaderFileModule
-	 * or one of its subclasses.
+	 * Whether the module is a ResourceLoaderFileModule (including subclasses).
 	 *
 	 * @param string $name Module name
 	 * @return bool
@@ -584,14 +583,13 @@ class ResourceLoader implements LoggerAwareInterface {
 		if ( isset( $info['object'] ) ) {
 			return false;
 		}
-		if (
-			isset( $info['class'] ) &&
-			$info['class'] !== ResourceLoaderFileModule::class &&
-			!is_subclass_of( $info['class'], ResourceLoaderFileModule::class )
-		) {
-			return false;
-		}
-		return true;
+		return (
+			// The implied default for 'class' is ResourceLoaderFileModule
+			!isset( $info['class'] ) ||
+			// Explicit default
+			$info['class'] === ResourceLoaderFileModule::class ||
+			is_subclass_of( $info['class'], ResourceLoaderFileModule::class )
+		);
 	}
 
 	/**