makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- only minor adjustements (we are now able to use other functions due to the increased php requirements)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5557 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-02-16 10:26:52 +00:00
parent 2ec9c9c82c
commit f2f0dc7892
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/db/mssql.php
View file

@ -203,7 +203,7 @@ class dbal_mssql extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
$row = @mssql_fetch_array($query_id, MSSQL_ASSOC); $row = @mssql_fetch_assoc($query_id);
// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug // I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
if ($row) if ($row)
@ -264,7 +264,7 @@ class dbal_mssql extends dbal
$result_id = @mssql_query('SELECT @@IDENTITY', $this->db_connect_id); $result_id = @mssql_query('SELECT @@IDENTITY', $this->db_connect_id);
if ($result_id) if ($result_id)
{ {
if (@mssql_fetch_array($result_id, MSSQL_ASSOC)) if (@mssql_fetch_assoc($result_id))
{ {
$id = @mssql_result($result_id, 1); $id = @mssql_result($result_id, 1);
@mssql_free_result($result_id); @mssql_free_result($result_id);
@ -340,7 +340,7 @@ class dbal_mssql extends dbal
$endtime = $endtime[0] + $endtime[1]; $endtime = $endtime[0] + $endtime[1];
$result = @mssql_query($query, $this->db_connect_id); $result = @mssql_query($query, $this->db_connect_id);
while ($void = @mssql_fetch_array($result, MSSQL_ASSOC)) while ($void = @mssql_fetch_assoc($result))
{ {
// Take the time spent on parsing rows into account // Take the time spent on parsing rows into account
} }

7
phpBB/includes/db/mysql.php
View file

@ -276,7 +276,12 @@ class dbal_mysql extends dbal
*/ */
function sql_escape($msg) function sql_escape($msg)
{ {
return mysql_escape_string($msg); if (!$this->db_connect_id)
{
return @mysql_real_escape_string($msg);
}
return @mysql_real_escape_string($msg, $this->db_connect_id);
} }
/** /**

7
phpBB/includes/db/mysql4.php
View file

@ -279,7 +279,12 @@ class dbal_mysql4 extends dbal
*/ */
function sql_escape($msg) function sql_escape($msg)
{ {
return mysql_escape_string($msg); if (!$this->db_connect_id)
{
return @mysql_real_escape_string($msg);
}
return @mysql_real_escape_string($msg, $this->db_connect_id);
} }
/** /**

10
phpBB/includes/db/postgres.php
View file

@ -235,7 +235,7 @@ class dbal_postgres extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
return ($query_id) ? @pg_fetch_array($query_id, NULL, PGSQL_ASSOC) : false; return ($query_id) ? @pg_fetch_assoc($query_id, NULL) : false;
} }
/** /**
@ -295,7 +295,7 @@ class dbal_postgres extends dbal
return false; return false;
} }
$temp_result = @pg_fetch_array($temp_q_id, NULL, PGSQL_ASSOC); $temp_result = @pg_fetch_assoc($temp_q_id, NULL);
@pg_freeresult($query_id); @pg_freeresult($query_id);
return ($temp_result) ? $temp_result['last_value'] : false; return ($temp_result) ? $temp_result['last_value'] : false;
@ -328,7 +328,7 @@ class dbal_postgres extends dbal
function sql_escape($msg) function sql_escape($msg)
{ {
// Do not use for bytea values // Do not use for bytea values
return pg_escape_string($msg); return @pg_escape_string($msg);
} }
/** /**
@ -338,7 +338,7 @@ class dbal_postgres extends dbal
function _sql_error() function _sql_error()
{ {
return array( return array(
'message' => @pg_errormessage(), 'message' => (!$this->db_connect_id) ? @pg_last_error() : @pg_last_error($this->db_connect_id),
'code' => '' 'code' => ''
); );
} }
@ -368,7 +368,7 @@ class dbal_postgres extends dbal
$endtime = $endtime[0] + $endtime[1]; $endtime = $endtime[0] + $endtime[1];
$result = @pg_exec($this->db_connect_id, $query); $result = @pg_exec($this->db_connect_id, $query);
while ($void = @pg_fetch_array($result, NULL, PGSQL_ASSOC)) while ($void = @pg_fetch_assoc($result, NULL))
{ {
// Take the time spent on parsing rows into account // Take the time spent on parsing rows into account
} }