diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
| commit | 208770d7fddefb7ac46dd63387bc8ab4a2724edd (patch) | |
| tree | 4d9377436c29a2b272505f7d9039d7110a48054d /phpBB/includes/db/driver/postgres.php | |
| parent | 1ca63fb30215c6fb4e51fdffc43c29ad0b417b42 (diff) | |
| parent | 0483971f7786b10c3359dfbe4912501de0d6c7de (diff) | |
| download | forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.gz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.bz2 forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.xz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.zip | |
Merge remote-tracking branch 'p/ticket/11305' into develop
* p/ticket/11305:
[ticket/11305] Mock container for cache driver in functional create_user()
[ticket/11305] Check for $cache being null before using it in db drivers.
[ticket/11305] Define hook finder as a service on the container.
[ticket/11305] Adjust comment.
[ticket/11305] Use phpbb_create_default_container.
[ticket/11305] Create a normal container during final installation step.
[ticket/11305] Retrieve cache driver from container rather than cache service.
[ticket/11305] Extract hook finder from cache service.
Diffstat (limited to 'phpBB/includes/db/driver/postgres.php')
| -rw-r--r-- | phpBB/includes/db/driver/postgres.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/includes/db/driver/postgres.php index cca97c9c0e..14854d179d 100644 --- a/phpBB/includes/db/driver/postgres.php +++ b/phpBB/includes/db/driver/postgres.php @@ -193,7 +193,7 @@ class phpbb_db_driver_postgres 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) @@ -208,7 +208,7 @@ class phpbb_db_driver_postgres 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); @@ -278,7 +278,7 @@ class phpbb_db_driver_postgres 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); } @@ -299,7 +299,7 @@ class phpbb_db_driver_postgres 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); } @@ -348,7 +348,7 @@ class phpbb_db_driver_postgres 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); } |