aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/oracle.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-11 01:44:59 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-11 01:44:59 +0200
commit2d9aa45aefc4d4e4c76edd7763efc2cd97b0801f (patch)
tree85a0cddad8158b1380b1a4f12b56eed1eb271574 /phpBB/includes/db/oracle.php
parent08a34ebe948b4cc4b6f53572a65da23f55613181 (diff)
parent9c61455d264d92194f66549d244ec68cdb3c9ead (diff)
downloadforums-2d9aa45aefc4d4e4c76edd7763efc2cd97b0801f.tar
forums-2d9aa45aefc4d4e4c76edd7763efc2cd97b0801f.tar.gz
forums-2d9aa45aefc4d4e4c76edd7763efc2cd97b0801f.tar.bz2
forums-2d9aa45aefc4d4e4c76edd7763efc2cd97b0801f.tar.xz
forums-2d9aa45aefc4d4e4c76edd7763efc2cd97b0801f.zip
Merge branch 'ticket/jellydoughnut/9637' into develop-olympus
* ticket/jellydoughnut/9637: [ticket/9637] Do not cache SQL server version in all cases
Diffstat (limited to 'phpBB/includes/db/oracle.php')
-rw-r--r--phpBB/includes/db/oracle.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index 5a9b18abf0..c8a9a5f604 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -56,10 +56,18 @@ class dbal_oracle extends dbal
/**
* Version information about used database
* @param bool $raw if true, only return the fetched sql_server_version
+ * @param bool $use_cache forced to false for Oracle
* @return string sql server version
*/
- function sql_server_info($raw = false)
+ function sql_server_info($raw = false, $use_cache = true)
{
+ /**
+ * force $use_cache false. I didn't research why the caching code below is commented out
+ * but I assume its because the Oracle extension provides a direct method to access it
+ * without a query.
+ */
+
+ $use_cache = false;
/*
global $cache;