mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-12 11:44:08 +02:00
ok, this one is rather large... the most important change:
re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different apart from this, code cleanage, bug fixing, etc. git-svn-id: file:///svn/phpbb/trunk@6015 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -48,37 +48,27 @@ class dbal_oracle extends dbal
|
||||
}
|
||||
|
||||
/**
|
||||
* sql transaction
|
||||
* SQL Transaction
|
||||
* @private
|
||||
*/
|
||||
function sql_transaction($status = 'begin')
|
||||
function _sql_transaction($status = 'begin')
|
||||
{
|
||||
switch ($status)
|
||||
{
|
||||
case 'begin':
|
||||
$result = true;
|
||||
$this->transaction = true;
|
||||
return true;
|
||||
break;
|
||||
|
||||
case 'commit':
|
||||
$result = @ocicommit($this->db_connect_id);
|
||||
$this->transaction = false;
|
||||
|
||||
if (!$result)
|
||||
{
|
||||
@ocirollback($this->db_connect_id);
|
||||
}
|
||||
return @ocicommit($this->db_connect_id);
|
||||
break;
|
||||
|
||||
case 'rollback':
|
||||
$result = @ocirollback($this->db_connect_id);
|
||||
$this->transaction = false;
|
||||
return @ocirollback($this->db_connect_id);
|
||||
break;
|
||||
|
||||
default:
|
||||
$result = true;
|
||||
}
|
||||
|
||||
return $result;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -355,7 +345,7 @@ class dbal_oracle extends dbal
|
||||
*/
|
||||
function sql_escape($msg)
|
||||
{
|
||||
return str_replace("'", "''", str_replace('\\', '\\\\', $msg));
|
||||
return str_replace("'", "''", $msg);
|
||||
}
|
||||
|
||||
function _sql_custom_build($stage, $data)
|
||||
|
Reference in New Issue
Block a user