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 d37d74f..d5a7180 100644 (file)
--- 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 f66cd5a..ef2df31 100644 (file)
--- 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.