From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Tue, 1 Apr 2014 12:52:33 +0000 (+0200)
Subject: Send profiled items under the correct name
X-Git-Tag: 1.31.0-rc.0~16409
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=f0d32bf65d52c3d65b6054c61a625cf48f4ccab3;p=lhc%2Fweb%2Fwiklou.git

Send profiled items under the correct name

Fix for Ie8481a2e13 (811a084). The "-total" item
was send under the name "close" since it's ended
by close().

Bug: 63347
Change-Id: Iad91f1d12303e5cfb92c111f79c0ce5a8187f53b
---

diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php
index 7d78e36913..6331a3049e 100644
--- a/includes/profiler/ProfilerSimple.php
+++ b/includes/profiler/ProfilerSimple.php
@@ -107,10 +107,10 @@ class ProfilerSimple extends Profiler {
 			if ( $functionname == 'close' ) {
 				if ( $ofname != '-total' ) {
 					$message = "Profile section ended by close(): {$ofname}";
-					$functionname = $ofname;
 					$this->debugGroup( 'profileerror', $message );
 					$this->mCollated[$message] = $this->errorEntry;
 				}
+				$functionname = $ofname;
 			} elseif ( $ofname != $functionname ) {
 				$message = "Profiling error: in({$ofname}), out($functionname)";
 				$this->debugGroup( 'profileerror', $message );