Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249072
Change subject: Follow-up to Ie3499d
......................................................................
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
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/249072/1
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index dfd9a8ff..5208c23 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -325,12 +325,10 @@
// 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
--
To view, visit https://gerrit.wikimedia.org/r/249072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13da33faf2f058ac75ef4b1615c4fafc18f14505
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
