From: Chad Horohoe <chadh@wikimedia.org>
Date: Tue, 4 Nov 2014 17:40:40 +0000 (-0800)
Subject: Profiler: Call getContentType() only once in logData()
X-Git-Tag: 1.31.0-rc.0~13398
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=43020f20720b1560a6f0417565bdd49944a41a2e;p=lhc%2Fweb%2Fwiklou.git

Profiler: Call getContentType() only once in logData()

Each call potentially does a regular expression check per output
header. No point in multiplying that by 3.

Change-Id: I30e9a6b5df1a773e9448ec9b77d0e79339f19738
---

diff --git a/includes/profiler/ProfilerSimpleText.php b/includes/profiler/ProfilerSimpleText.php
index 2d96b88827..cc18890c2f 100644
--- a/includes/profiler/ProfilerSimpleText.php
+++ b/includes/profiler/ProfilerSimpleText.php
@@ -50,17 +50,18 @@ class ProfilerSimpleText extends ProfilerStandard {
 				: 0; // profiling mismatch error?
 			uasort( $this->mCollated, array( 'self', 'sort' ) );
 			array_walk( $this->mCollated, array( 'self', 'format' ), $totalReal );
+			$contentType = $this->getContentType();
 			if ( PHP_SAPI === 'cli' ) {
 				print "<!--\n" . self::$out . "\n-->\n";
-			} elseif ( $this->getContentType() === 'text/html' ) {
+			} elseif ( $contentType === 'text/html' ) {
 				if ( $this->visible ) {
 					print '<pre>' . self::$out . '</pre>';
 				} else {
 					print "<!--\n" . self::$out . "\n-->\n";
 				}
-			} elseif ( $this->getContentType() === 'text/javascript' ) {
+			} elseif ( $contentType === 'text/javascript' ) {
 				print "\n/*\n" . self::$out . "*/\n";
-			} elseif ( $this->getContentType() === 'text/css' ) {
+			} elseif ( $contentType === 'text/css' ) {
 				print "\n/*\n" . self::$out . "*/\n";
 			}
 		}
diff --git a/includes/profiler/ProfilerSimpleTrace.php b/includes/profiler/ProfilerSimpleTrace.php
index 95e4bc6d29..0dd406798d 100644
--- a/includes/profiler/ProfilerSimpleTrace.php
+++ b/includes/profiler/ProfilerSimpleTrace.php
@@ -67,13 +67,14 @@ class ProfilerSimpleTrace extends ProfilerStandard {
 
 	public function logData() {
 		if ( $this->mTemplated ) {
+			$contentType = $this->getContentType();
 			if ( PHP_SAPI === 'cli' ) {
 				print "<!-- \n {$this->trace} \n -->";
-			} elseif ( $this->getContentType() === 'text/html' ) {
+			} elseif ( $contentType === 'text/html' ) {
 				print "<!-- \n {$this->trace} \n -->";
-			} elseif ( $this->getContentType() === 'text/javascript' ) {
+			} elseif ( $contentType === 'text/javascript' ) {
 				print "\n/*\n {$this->trace}\n*/";
-			} elseif ( $this->getContentType() === 'text/css' ) {
+			} elseif ( $contentType === 'text/css' ) {
 				print "\n/*\n {$this->trace}\n*/";
 			}
 		}