summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-03-19 18:15:41 +0100
committerAndrey Andreev <narf@devilix.net>2014-03-19 18:15:41 +0100
commit6c12a84beebf46bdfec6ac7b2ff4412e6b3daf96 (patch)
treeab9f39bab4da767a8e0099476a91d1700bc60403
parent46d2072e5ce0c13f3be2bd909d76eba37964740f (diff)
parent70a8626a4d9ddbf9467970acf1b329b1d484791f (diff)
Merge pull request #2956 from rythie/develop
Fix profiling of benchmarked names like 'something_endpoint_end'
-rw-r--r--system/libraries/Profiler.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 810a025a4..197dab7d9 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -153,7 +153,7 @@ class CI_Profiler {
{
// We match the "end" marker so that the list ends
// up in the order that it was defined
- if (preg_match('/(.+?)_end/i', $key, $match)
+ if (preg_match('/(.+?)_end$/i', $key, $match)
&& isset($this->CI->benchmark->marker[$match[1].'_end'], $this->CI->benchmark->marker[$match[1].'_start']))
{
$profile[$match[1]] = $this->CI->benchmark->elapsed_time($match[1].'_start', $key);