aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/acp/acp_profile.php3
-rw-r--r--phpBB/includes/db/firebird.php2
-rw-r--r--phpBB/includes/db/oracle.php2
-rw-r--r--phpBB/includes/db/postgres.php2
-rw-r--r--phpBB/includes/functions_profile_fields.php6
5 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 42e70eddd8..821ffd0fc2 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -945,6 +945,9 @@ class acp_profile
if ($action == 'create')
{
+
+ $field_ident = '_' . $field_ident;
+
switch (SQL_LAYER)
{
case 'mysql':
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 3a0567d90a..8eec225c96 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -113,7 +113,7 @@ class dbal_firebird extends dbal
if (!$this->transaction)
{
- @ibase_commit_ret();
+ @ibase_commit();
}
if ($cache_ttl && method_exists($cache, 'sql_save'))
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index d891cab337..bc7bf5ec16 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -278,7 +278,7 @@ class dbal_oracle extends dbal
// OCI->CLOB?
if (is_object($value))
{
- $value = ($value->size()) ? $value->read($value->size()) : '';
+ $value = ociloadlob($value);
}
$result_row[strtolower($key)] = $value;
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index f20bd2c4df..3a8e52f78d 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -91,7 +91,7 @@ class dbal_postgres extends dbal
{
$version = @pg_version($this->db_connect_id);
- return 'PostgresSQL' . ((!empty($version)) ? ' ' . $version['client'] : '');
+ return 'PostgreSQL' . ((!empty($version)) ? ' ' . $version['client'] : '');
}
/**
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 0a77eb9d3d..67344a3c40 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -286,8 +286,8 @@ class custom_profile
while ($row = $db->sql_fetchrow($result))
{
- $cp_data[$row['field_ident']] = $this->get_profile_field($row);
- $check_value = $cp_data[$row['field_ident']];
+ $cp_data['_' . $row['field_ident']] = $this->get_profile_field($row);
+ $check_value = $cp_data['_' . $row['field_ident']];
if (($cp_result = $this->validate_profile_field($row['field_type'], $check_value, $row)) !== false)
{
@@ -382,7 +382,7 @@ class custom_profile
{
foreach ($field_data as $user_id => $row)
{
- $user_fields[$user_id][$used_ident]['value'] = $row[$used_ident];
+ $user_fields[$user_id][$used_ident]['value'] = $row['_' . $used_ident];
$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
}
}