Merge "Follow-up to Ie3499d"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 Oct 2015 09:47:21 +0000 (09:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 Oct 2015 09:47:21 +0000 (09:47 +0000)
includes/resourceloader/ResourceLoader.php

index dfd9a8f..5208c23 100644 (file)
@@ -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