diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 14:36:14 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 14:36:14 -0500 |
| commit | c8c6eb46ec6eefe0e58aebcd44f4c69f5df4b065 (patch) | |
| tree | 637605d783c1d0554ecbcfc54875efd87c710ca8 /phpBB/includes/db/driver/oracle.php | |
| parent | bc317c49a73bb6e271ac084b0b696b44e20babe8 (diff) | |
| download | forums-c8c6eb46ec6eefe0e58aebcd44f4c69f5df4b065.tar forums-c8c6eb46ec6eefe0e58aebcd44f4c69f5df4b065.tar.gz forums-c8c6eb46ec6eefe0e58aebcd44f4c69f5df4b065.tar.bz2 forums-c8c6eb46ec6eefe0e58aebcd44f4c69f5df4b065.tar.xz forums-c8c6eb46ec6eefe0e58aebcd44f4c69f5df4b065.zip | |
[ticket/11305] Check for $cache being null before using it in db drivers.
There is no reason why db drivers must have a cache to work.
They query the database, that part works without caches.
PHPBB3-11305
Diffstat (limited to 'phpBB/includes/db/driver/oracle.php')
| -rw-r--r-- | phpBB/includes/db/driver/oracle.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/includes/db/driver/oracle.php index 53f9dd71e0..e21e07055d 100644 --- a/phpBB/includes/db/driver/oracle.php +++ b/phpBB/includes/db/driver/oracle.php @@ -267,7 +267,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver } $this->last_query_text = $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) @@ -443,7 +443,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver $this->sql_report('stop', $query); } - if ($cache_ttl) + if ($cache && $cache_ttl) { $this->open_queries[(int) $this->query_result] = $this->query_result; $this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl); @@ -498,7 +498,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver $query_id = $this->query_result; } - if ($cache->sql_exists($query_id)) + if ($cache && $cache->sql_exists($query_id)) { return $cache->sql_fetchrow($query_id); } @@ -550,7 +550,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver $query_id = $this->query_result; } - if ($cache->sql_exists($query_id)) + if ($cache && $cache->sql_exists($query_id)) { return $cache->sql_rowseek($rownum, $query_id); } @@ -619,7 +619,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver $query_id = $this->query_result; } - if ($cache->sql_exists($query_id)) + if ($cache && $cache->sql_exists($query_id)) { return $cache->sql_freeresult($query_id); } |