From 315ffffcaabf377be3b87e4b5e59188c08ee35e6 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 19 Nov 2014 11:39:00 -0800 Subject: [PATCH] Avoid sending empty function names to TransactionProfiler * This could happen if the Profiler was a stub Change-Id: Id4f635f899ee3c0ca85acf1b1e4cde47dcbbdc75 --- includes/db/Database.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 ); -- 2.20.1