From 9043cf759bb98dd6db45d0e4fbc906a3522a74b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jul 2017 20:27:30 +0200
Subject: [PATCH] Fix clone function
---
htdocs/core/lib/functions.lib.php | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c9d5759f0e4..de07281696a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -624,18 +624,26 @@ function dol_buildpath($path, $type=0)
/**
* Create a clone of instance of object (new instance with same value for properties)
- * Property that are reference are also new object (true clone)
+ * With native = 0: Property that are reference are also new object (true clone). This means $this->db is not valid.
+ * With native = 1: Use PHP clone. Property that are reference are same pointer. This means $this->db is still valid.
*
* @param object $object Object to clone
+ * @param int $native Native method or true method
* @return object Object clone
* @see https://php.net/manual/language.oop5.cloning.php
*/
-function dol_clone($object)
+function dol_clone($object, $native=0)
{
//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
- //$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable
- $myclone=unserialize(serialize($object));
+ if (empty($native))
+ {
+ $myclone=unserialize(serialize($object));
+ }
+ else
+ {
+ $myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
+ }
return $myclone;
}
--
GitLab