git-svn-id: file:///svn/phpbb/trunk@7676 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-05-25 12:25:46 +00:00
parent b4b9f7fee2
commit 17315b69c6

View file

@ -45,8 +45,7 @@ class dbal_oracle extends dbal
{ {
$sqlserver == substr($sqlserver, 0, -1); $sqlserver == substr($sqlserver, 0, -1);
} }
$connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $dbname; $connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
$this->dbname = $connect;
} }
$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')); $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'));