mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11015] Fixup some things from the big merge

Browse Source 
PHPBB3-11015
This commit is contained in:
Igor Wiedler
2012-11-12 11:10:25 +01:00
parent bf641a7f31
commit 0fd3bb170b
18 changed files with 87 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/db/driver/mysqli.php
View File

@@ -172,12 +172,12 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
global $cache;
// EXPLAIN only in extra debug mode
if (defined('DEBUG_EXTRA'))
if (defined('DEBUG'))
{
$this->sql_report('start', $query);
}
$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
$this->sql_add_num_queries($this->query_result);
if ($this->query_result === false)
@@ -187,17 +187,17 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
$this->sql_error($query);
}
if (defined('DEBUG_EXTRA'))
if (defined('DEBUG'))
{
$this->sql_report('stop', $query);
}
if ($cache_ttl && method_exists($cache, 'sql_save'))
if ($cache_ttl)
{
$cache->sql_save($query, $this->query_result, $cache_ttl);
$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
}
}
else if (defined('DEBUG_EXTRA'))
else if (defined('DEBUG'))
{
$this->sql_report('fromcache', $query);
}
@@ -249,7 +249,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
$query_id = $this->query_result;
}
if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
if (!is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_fetchrow($query_id);
}
@@ -276,7 +276,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
$query_id = $this->query_result;
}
if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
if (!is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_rowseek($rownum, $query_id);
}
@@ -304,7 +304,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
$query_id = $this->query_result;
}
if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
if (!is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}