aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/driver/mssqlnative.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-22 23:13:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-22 23:13:14 +0200
commitd18d3b30c70c0fb48cad14576376ee51671d094e (patch)
tree8f4e973dde14b1e7ed08e64b3ae294ebdd073b8d /phpBB/phpbb/db/driver/mssqlnative.php
parent4f6255687e53105b68d8b751b343f307a6968b51 (diff)
parentde04304e94c428afd6dcb9f42b215ebbb6cc14d2 (diff)
downloadforums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar.gz
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar.bz2
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar.xz
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12704] Improve the load time information in the footer when enabled
Diffstat (limited to 'phpBB/phpbb/db/driver/mssqlnative.php')
-rw-r--r--phpBB/phpbb/db/driver/mssqlnative.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index a7f93c8feb..46a9b3a477 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -127,6 +127,10 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
{
$this->sql_report('start', $query);
}
+ else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+ {
+ $this->curtime = microtime(true);
+ }
$this->last_query_text = $query;
$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
@@ -145,6 +149,10 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
{
$this->sql_report('stop', $query);
}
+ else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+ {
+ $this->sql_time += microtime(true) - $this->curtime;
+ }
if ($cache && $cache_ttl)
{