diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
| commit | 5d091e2d8f5079a8ce8dc14500c29f6642c40e98 (patch) | |
| tree | f4c73527be7e6f5e783351edc306e929a8946b31 /phpBB/includes/db/driver/mysqli.php | |
| parent | 4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c (diff) | |
| parent | 228580b6743b9650996284dd04a3f5de6c2447ca (diff) | |
| download | forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.gz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.bz2 forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.xz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/includes/ucp/ucp_groups.php
Diffstat (limited to 'phpBB/includes/db/driver/mysqli.php')
| -rw-r--r-- | phpBB/includes/db/driver/mysqli.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php index 4f45c5781c..7448bf1670 100644 --- a/phpBB/includes/db/driver/mysqli.php +++ b/phpBB/includes/db/driver/mysqli.php @@ -184,7 +184,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver $this->sql_report('start', $query); } - $this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false; + $this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false; $this->sql_add_num_queries($this->query_result); if ($this->query_result === false) @@ -199,7 +199,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver $this->sql_report('stop', $query); } - if ($cache_ttl) + if ($cache && $cache_ttl) { $this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl); } @@ -256,7 +256,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver $query_id = $this->query_result; } - if (!is_object($query_id) && $cache->sql_exists($query_id)) + if ($cache && !is_object($query_id) && $cache->sql_exists($query_id)) { return $cache->sql_fetchrow($query_id); } @@ -283,7 +283,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver $query_id = $this->query_result; } - if (!is_object($query_id) && $cache->sql_exists($query_id)) + if ($cache && !is_object($query_id) && $cache->sql_exists($query_id)) { return $cache->sql_rowseek($rownum, $query_id); } @@ -311,7 +311,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver $query_id = $this->query_result; } - if (!is_object($query_id) && $cache->sql_exists($query_id)) + if ($cache && !is_object($query_id) && $cache->sql_exists($query_id)) { return $cache->sql_freeresult($query_id); } |