From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 19 Nov 2014 19:39:00 +0000 (-0800)
Subject: Avoid sending empty function names to TransactionProfiler
X-Git-Tag: 1.31.0-rc.0~13242^2
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=315ffffcaabf377be3b87e4b5e59188c08ee35e6;p=lhc%2Fweb%2Fwiklou.git

Avoid sending empty function names to TransactionProfiler

* This could happen if the Profiler was a stub

Change-Id: Id4f635f899ee3c0ca85acf1b1e4cde47dcbbdc75
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 2d14bcb358..aa0e4de59d 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1000,12 +1000,14 @@ abstract class DatabaseBase implements IDatabase {
 		}
 
 		# Log the query time and feed it into the DB trx profiler
-		$queryStartTime = microtime( true );
-		$queryProfile = new ScopedCallback( function() use ( $queryStartTime, $queryProf ) {
-			$elapsed = microtime( true ) - $queryStartTime;
-			$trxProfiler = Profiler::instance()->getTransactionProfiler();
-			$trxProfiler->recordFunctionCompletion( $queryProf, $elapsed );
-		} );
+		if ( $queryProf != '' ) {
+			$queryStartTime = microtime( true );
+			$queryProfile = new ScopedCallback( function() use ( $queryStartTime, $queryProf ) {
+				$elapsed = microtime( true ) - $queryStartTime;
+				$trxProfiler = Profiler::instance()->getTransactionProfiler();
+				$trxProfiler->recordFunctionCompletion( $queryProf, $elapsed );
+			} );
+		}
 
 		# Do the query and handle errors
 		$ret = $this->doQuery( $commentedSql );