mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
this change should let firebird work again correctly... or not.
git-svn-id: file:///svn/phpbb/trunk@6229 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
b15a3111be
commit
a07193a22a
1 changed files with 3 additions and 8 deletions
|
@ -49,7 +49,7 @@ class dbal_firebird extends dbal
|
|||
/**
|
||||
* @todo evaluate the implications of opening a service connection
|
||||
*/
|
||||
$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
|
||||
$this->service_handle = (function_exists('ibase_service_attach')) ? @ibase_service_attach($this->server, $this->user, $sqlpassword) : false;
|
||||
|
||||
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
|
||||
}
|
||||
|
@ -59,7 +59,7 @@ class dbal_firebird extends dbal
|
|||
*/
|
||||
function sql_server_info()
|
||||
{
|
||||
if ($this->service_handle !== false)
|
||||
if ($this->service_handle !== false && function_exists('ibase_server_info'))
|
||||
{
|
||||
return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
|
||||
}
|
||||
|
@ -76,7 +76,7 @@ class dbal_firebird extends dbal
|
|||
switch ($status)
|
||||
{
|
||||
case 'begin':
|
||||
return true;
|
||||
return @ibase_trans();
|
||||
break;
|
||||
|
||||
case 'commit':
|
||||
|
@ -117,11 +117,6 @@ class dbal_firebird extends dbal
|
|||
$this->sql_error($query);
|
||||
}
|
||||
|
||||
if (!$this->transaction)
|
||||
{
|
||||
@ibase_commit();
|
||||
}
|
||||
|
||||
if ($cache_ttl && method_exists($cache, 'sql_save'))
|
||||
{
|
||||
$this->open_queries[(int) $this->query_result] = $this->query_result;
|
||||
|
|
Loading…
Add table
Reference in a new issue