Follow-up to Ie3499d

My first pass at what became Ie3499d9f2 was to keep the exception for duplicate
registrations with conflicting parameters but downgrade to a warning if the
registration attempts are identically parametrized. I then removed the
exception entirely, but left the if-block, which does not make much sense, as
it means we pass over silently module registrations that set different
parameters, and throw a warning only when they are the same.

Change-Id: I13da33faf2f058ac75ef4b1615c4fafc18f14505

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index dfd9a8f..5208c23 100644 (file)
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -325,12 +325,10 @@ class ResourceLoader implements LoggerAwareInterface {
                        // Warn on duplicate registrations
                        if ( isset( $this->moduleInfos[$name] ) ) {
                                // A module has already been registered by this name
-                               if ( $this->moduleInfos[$name] === $info ) {
-                                       $this->logger->warning(
-                                               'ResourceLoader duplicate registration warning. ' .
-                                               'Another module has already been registered as ' . $name
-                                       );
-                               }
+                               $this->logger->warning(
+                                       'ResourceLoader duplicate registration warning. ' .
+                                       'Another module has already been registered as ' . $name
+                               );
                        }
 
                        // Check $name for validity