mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

some adjustments

Browse Source 
nils: please have a look at the @todo comment in mcp_queue.php


git-svn-id: file:///svn/phpbb/trunk@6002 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-06-02 13:26:27 +00:00
parent b087e60113
commit 7d264396df
13 changed files with 256 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
phpBB/includes/db/mysql4.php
View File

@@ -67,22 +67,22 @@ class dbal_mysql4 extends dbal
case 'begin':
$result = @mysql_query('BEGIN', $this->db_connect_id);
$this->transaction = true;
break;
break;
case 'commit':
$result = @mysql_query('COMMIT', $this->db_connect_id);
$this->transaction = false;
if (!$result)
{
@mysql_query('ROLLBACK', $this->db_connect_id);
}
break;
break;
case 'rollback':
$result = @mysql_query('ROLLBACK', $this->db_connect_id);
$this->transaction = false;
break;
break;
default:
$result = true;
@@ -148,10 +148,10 @@ class dbal_mysql4 extends dbal
* Build LIMIT query
*/
function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
{
if ($query != '')
{
if ($query != '')
{
$this->query_result = false;
$this->query_result = false;
// if $total is set to 0 we do not want to limit the number of rows
if ($total == 0)
@@ -162,12 +162,12 @@ class dbal_mysql4 extends dbal
$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
return $this->sql_query($query, $cache_ttl);
}
else
{
return false;
}
return $this->sql_query($query, $cache_ttl);
}
else
{
return false;
}
}
/**
@@ -289,7 +289,7 @@ class dbal_mysql4 extends dbal
{
return @mysql_real_escape_string($msg);
}
return @mysql_real_escape_string($msg, $this->db_connect_id);
}
@@ -305,6 +305,7 @@ class dbal_mysql4 extends dbal
$data = '(' . $data . ')';
break;
}
return $data;
}
@@ -321,7 +322,7 @@ class dbal_mysql4 extends dbal
'code' => @mysql_errno()
);
}
return array(
'message' => @mysql_error($this->db_connect_id),
'code' => @mysql_errno($this->db_connect_id)