From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 31 Mar 2015 07:44:08 +0000 (-0700)
Subject: Made text profiling actually work with load.php
X-Git-Tag: 1.31.0-rc.0~11920^2
X-Git-Url: http://git.cyclocoop.org/%27%20.%20url_absolue%28%24favicon%29%20.%20?a=commitdiff_plain;h=3ca6ab103166c0f12f7a192b14bdffced003c610;p=lhc%2Fweb%2Fwiklou.git

Made text profiling actually work with load.php

Change-Id: I8d28ad8669e8c2f5d7025fe67fb75d0551975e07
---

diff --git a/includes/profiler/output/ProfilerOutputText.php b/includes/profiler/output/ProfilerOutputText.php
index d37d74f06e..d5a7180116 100644
--- a/includes/profiler/output/ProfilerOutputText.php
+++ b/includes/profiler/output/ProfilerOutputText.php
@@ -70,7 +70,7 @@ class ProfilerOutputText extends ProfilerOutput {
 					print "<!--\n{$out}\n-->\n";
 				}
 			} elseif ( $contentType === 'text/javascript' ) {
-				print "\n/*\n${$out}*/\n";
+				print "\n/*\n{$out}*/\n";
 			} elseif ( $contentType === 'text/css' ) {
 				print "\n/*\n{$out}*/\n";
 			}
diff --git a/load.php b/load.php
index f66cd5a8ec..ef2df3126f 100644
--- a/load.php
+++ b/load.php
@@ -43,6 +43,7 @@ $configFactory = ConfigFactory::getDefaultInstance();
 $resourceLoader = new ResourceLoader( $configFactory->makeConfig( 'main' ) );
 $resourceLoader->respond( new ResourceLoaderContext( $resourceLoader, $wgRequest ) );
 
+Profiler::instance()->setTemplated( true );
 wfLogProfilingData();
 
 // Shut down the database.