aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/mysql4.php1
-rw-r--r--phpBB/includes/db/oracle.php2
-rw-r--r--phpBB/includes/db/postgres.php7
3 files changed, 1 insertions, 9 deletions
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index dd89de5e5c..3740d22669 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -27,7 +27,6 @@ if (!defined('SQL_LAYER'))
/**
* MySQL4 Database Abstraction Layer
* Compatible with:
-* MySQL 4.0+
* MySQL 4.1+
* MySQL 5.0+
* @package dbal
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index e87b7aa1f9..b988bc6a3c 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -42,7 +42,7 @@ class dbal_oracle extends dbal
$this->server = $sqlserver . (($port) ? ':' . $port : '');
$this->dbname = $database;
- $this->db_connect_id = ($this->persistency) ? @ociplogon($this->user, $sqlpassword, $this->server) : @ocinlogon($this->user, $sqlpassword, $this->server);
+ $this->db_connect_id = ($this->persistency) ? @ociplogon($this->user, $sqlpassword, $this->server, 'UTF8') : @ocinlogon($this->user, $sqlpassword, $this->server, 'UTF8');
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index a91a8e81bb..ff58269f51 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -268,13 +268,6 @@ class dbal_postgres extends dbal
}
$row = @pg_fetch_assoc($query_id, null);
- if ($row)
- {
- foreach ($row as $key => $value)
- {
- $row[$key] = (strpos($key, 'bitfield') === false) ? $value : pg_unescape_bytea($value);
- }
- }
return ($query_id) ? $row : false;
}