From 1d1178535f14868911b16b2437faf0642ef7b657 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Mon, 25 Jun 2018 19:25:36 +0100 Subject: [PATCH] resourceloader: Fix duplicate semi-colon in generated startup code The startup.js template used '$CODE.registrations();', which makes sense syntatically (and for the linter), but the substitution logic was only replacing the '$CODE.registrations()' portion. This made the generated output contain two consecutive semi-colons. Change-Id: Ibef1a0d932b19037987a7effa12aa57f578a142d --- includes/resourceloader/ResourceLoaderStartUpModule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 4777545d23..120f559fc6 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -396,7 +396,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { // This url may be preloaded. See getPreloadLinks(). '$VARS.baseModulesUri' => self::getStartupModulesUrl( $context ), ] ); - $pairs['$CODE.registrations()'] = str_replace( + $pairs['$CODE.registrations();'] = str_replace( "\n", "\n\t", trim( $this->getModuleRegistrations( $context ) ) -- 2.20.1