diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-30 23:06:16 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-30 23:06:16 +0200 |
| commit | fbd75775efbf1f9d98b29835d1ef97b8cf4d55d4 (patch) | |
| tree | 80a50ce71dac56c6c55a1f489ec6a9492ef03f15 /phpBB/includes/db/mssql.php | |
| parent | 17681c0770e3a3fb7a4b0ef74e4038c6de787119 (diff) | |
| parent | edcac438df164764c84ca9fb7a7f751bf76d5c34 (diff) | |
| download | forums-fbd75775efbf1f9d98b29835d1ef97b8cf4d55d4.tar forums-fbd75775efbf1f9d98b29835d1ef97b8cf4d55d4.tar.gz forums-fbd75775efbf1f9d98b29835d1ef97b8cf4d55d4.tar.bz2 forums-fbd75775efbf1f9d98b29835d1ef97b8cf4d55d4.tar.xz forums-fbd75775efbf1f9d98b29835d1ef97b8cf4d55d4.zip | |
Merge remote-tracking branch 'EXreaction/ticket/10875' into develop
* EXreaction/ticket/10875:
[ticket/10875] method_exists check is not required, interface declares them
[ticket/10875] Changes to Cache Driver caused method_exists checks to fail
Diffstat (limited to 'phpBB/includes/db/mssql.php')
| -rw-r--r-- | phpBB/includes/db/mssql.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index fb044b492f..e40510835a 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -144,7 +144,7 @@ class dbal_mssql extends dbal $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) @@ -159,7 +159,7 @@ class dbal_mssql extends dbal $this->sql_report('stop', $query); } - if ($cache_ttl && method_exists($cache, 'sql_save')) + if ($cache_ttl) { $this->open_queries[(int) $this->query_result] = $this->query_result; $cache->sql_save($query, $this->query_result, $cache_ttl); |