From e3c27e2a6924f81ce9179261e9c1849e8fb06db6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 4 Sep 2010 12:19:47 +0000
Subject: [PATCH] Fix: Error in close function
---
htdocs/lib/databases/mssql.lib.php | 2 +-
htdocs/lib/databases/mysql.lib.php | 2 +-
htdocs/lib/databases/mysqli.lib.php | 2 +-
htdocs/lib/databases/pgsql.lib.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php
index 04525727aef..7c04d8daa40 100644
--- a/htdocs/lib/databases/mssql.lib.php
+++ b/htdocs/lib/databases/mssql.lib.php
@@ -237,7 +237,7 @@ class DoliDb
function close()
{
dol_syslog("DoliDB::disconnect",LOG_DEBUG);
- return mssql_close($this->db);
+ return $this->db?mssql_close($this->db):0;
}
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index 3f0b28f4c77..ba447cd2787 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -281,7 +281,7 @@ class DoliDb
function close()
{
dol_syslog("DoliDB::disconnect",LOG_DEBUG);
- return mysql_close($this->db);
+ return ($this->db?mysql_close($this->db):0);
}
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index 4cfcb534e5b..fb8d5b534f2 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -288,7 +288,7 @@ class DoliDb
function close()
{
dol_syslog("DoliDB::disconnect",LOG_DEBUG);
- return mysqli_close($this->db);
+ return $this->db?mysqli_close($this->db):0;
}
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index 9ad226662fe..fc4c24bbf27 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -404,7 +404,7 @@ class DoliDb
function close()
{
dol_syslog("DoliDB::disconnect",LOG_DEBUG);
- return pg_close($this->db);
+ return $this->db?pg_close($this->db):0;
}
/**
--
GitLab