aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-05-25 12:25:46 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-05-25 12:25:46 +0000
commit17315b69c69fba5bad5f78bc1d38c301692f9904 (patch)
treee36113f3eb7f5837d201e306bf7099ee9fd96392 /phpBB/includes/db
parentb4b9f7fee276d147b14f9415a24184e5c95fc8e5 (diff)
downloadforums-17315b69c69fba5bad5f78bc1d38c301692f9904.tar
forums-17315b69c69fba5bad5f78bc1d38c301692f9904.tar.gz
forums-17315b69c69fba5bad5f78bc1d38c301692f9904.tar.bz2
forums-17315b69c69fba5bad5f78bc1d38c301692f9904.tar.xz
forums-17315b69c69fba5bad5f78bc1d38c301692f9904.zip
d'oh!
git-svn-id: file:///svn/phpbb/trunk@7676 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/oracle.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index f6456a17ad..360928e96d 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -45,8 +45,7 @@ class dbal_oracle extends dbal
{
$sqlserver == substr($sqlserver, 0, -1);
}
- $connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $dbname;
- $this->dbname = $connect;
+ $connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
}
$this->db_connect_id = ($new_link) ? @ocinlogon($this->user, $sqlpassword, $connect, 'UTF8') : (($this->persistency) ? @ociplogon($this->user, $sqlpassword, $connect, 'UTF8') : @ocinlogon($this->user, $sqlpassword, $connect, 'UTF8'));