aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-03-06 21:11:23 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-03-06 21:11:23 +0000
commit484946e0d7b8478229558166c0b76667a01e02ae (patch)
tree7aec7f2651c65fb48b1c24b45eb3e7589d50246c
parente981c166eae48eae6bc9506d1b2005b021b8616a (diff)
downloadforums-484946e0d7b8478229558166c0b76667a01e02ae.tar
forums-484946e0d7b8478229558166c0b76667a01e02ae.tar.gz
forums-484946e0d7b8478229558166c0b76667a01e02ae.tar.bz2
forums-484946e0d7b8478229558166c0b76667a01e02ae.tar.xz
forums-484946e0d7b8478229558166c0b76667a01e02ae.zip
#8538
git-svn-id: file:///svn/phpbb/trunk@7140 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/db/oracle.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index 1920ce8fc1..21585e5899 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -36,7 +36,7 @@ class dbal_oracle extends dbal
$this->server = $sqlserver . (($port) ? ':' . $port : '');
$this->dbname = $database;
- $this->db_connect_id = ($new_link) ? @ocinlogon($this->user, $sqlpassword, $this->server, 'UTF8') : (($this->persistency) ? @ociplogon($this->user, $sqlpassword, $this->server, 'UTF8') : @ocinlogon($this->user, $sqlpassword, $this->server, 'UTF8'));
+ $this->db_connect_id = ($new_link) ? @ocinlogon($this->user, $sqlpassword, $this->dbname, 'UTF8') : (($this->persistency) ? @ociplogon($this->user, $sqlpassword, $this->dbname, 'UTF8') : @ocinlogon($this->user, $sqlpassword, $this->dbname, 'UTF8'));
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}