From 3b3f4044cbf839c2b1edebe949967ac5a2f63243 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Mon, 26 Feb 2018 15:16:33 +0000 Subject: [PATCH] =?UTF-8?q?N=C2=B01260=20Mutex=20:=20fix=20merge=20error?= =?UTF-8?q?=20in=20mutex=20name=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN:trunk[5369] --- core/mutex.class.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/core/mutex.class.inc.php b/core/mutex.class.inc.php index 6bb7ba627..8eb6e2e63 100644 --- a/core/mutex.class.inc.php +++ b/core/mutex.class.inc.php @@ -71,7 +71,6 @@ class iTopMutex $this->sDBTlsCaPath = is_null($sDBTlsCaPath) ? $oConfig->Get('db_tls.capath') : $sDBTlsCaPath; $this->sDBTlsCipher = is_null($sDBTlsCypher) ? $oConfig->Get('db_tls.cipher') : $sDBTlsCypher; - $this->sName = 'itop.'.$sName; $this->sName = $sName; if (substr($sName, -strlen($this->sDBName.$sDBSubname)) != $this->sDBName.$sDBSubname) {