From d3e3bcfd6daad1f2a5894129b7e6d2f5c4390a6f Mon Sep 17 00:00:00 2001 From: Ori Livneh Date: Tue, 27 Oct 2015 00:44:47 -0700 Subject: [PATCH] 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 --- includes/resourceloader/ResourceLoader.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index dfd9a8ffe7..5208c23876 100644 --- 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 -- 2.20.1