diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:36 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:36 +0200 |
| commit | e97fab49e2ce73a8cc179a934ed8c0a05057bda3 (patch) | |
| tree | ef1a9f196e258b2a1297b84b59583fdab65d59d7 /phpBB/includes/functions.php | |
| parent | 4558262e2aaf31b4583a87622e97a46ead11537c (diff) | |
| parent | 53ff23671c2706c13bbe8ecca6b29b3c3456768b (diff) | |
| download | forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.gz forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.bz2 forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.xz forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 48cd30e0a4..9d5770069d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4029,7 +4029,7 @@ function obtain_guest_count($item_id = 0, $item = 'forum') // Get number of online guests - if ($db->sql_layer === 'sqlite' || $db->sql_layer === 'sqlite3') + if ($db->get_sql_layer() === 'sqlite' || $db->get_sql_layer() === 'sqlite3') { $sql = 'SELECT COUNT(session_ip) as num_guests FROM ( @@ -5096,7 +5096,7 @@ function phpbb_generate_debug_output(phpbb\db\driver\driver_interface $db, \phpb if (isset($GLOBALS['starttime'])) { $totaltime = microtime(true) - $GLOBALS['starttime']; - $debug_info[] = sprintf('<abbr title="SQL time: %.3fs / PHP time: %.3fs">Time: %.3fs</abbr>', $db->sql_time, ($totaltime - $db->sql_time), $totaltime); + $debug_info[] = sprintf('<abbr title="SQL time: %.3fs / PHP time: %.3fs">Time: %.3fs</abbr>', $db->get_sql_time(), ($totaltime - $db->get_sql_time()), $totaltime); } $debug_info[] = sprintf('<abbr title="Cached: %d">Queries: %d</abbr>', $db->sql_num_queries(true), $db->sql_num_queries()); |