Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200818
Change subject: Made text profiling actually work with load.php
......................................................................
Made text profiling actually work with load.php
Change-Id: I8d28ad8669e8c2f5d7025fe67fb75d0551975e07
---
M includes/profiler/output/ProfilerOutputText.php
M load.php
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/18/200818/1
diff --git a/includes/profiler/output/ProfilerOutputText.php
b/includes/profiler/output/ProfilerOutputText.php
index d37d74f..d5a7180 100644
--- a/includes/profiler/output/ProfilerOutputText.php
+++ b/includes/profiler/output/ProfilerOutputText.php
@@ -70,7 +70,7 @@
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
--- a/load.php
+++ b/load.php
@@ -43,6 +43,7 @@
$resourceLoader = new ResourceLoader( $configFactory->makeConfig( 'main' ) );
$resourceLoader->respond( new ResourceLoaderContext( $resourceLoader,
$wgRequest ) );
+Profiler::instance()->setTemplated( true );
wfLogProfilingData();
// Shut down the database.
--
To view, visit https://gerrit.wikimedia.org/r/200818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d28ad8669e8c2f5d7025fe67fb75d0551975e07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
