Ver código fonte

#1039 Continuation of the fix implemented in [3465] that introduced a stopper regression (Fatal Error)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3472 a333f486-631f-4898-b8df-5754b55c2be0
romainq 10 anos atrás
pai
commit
30c759983a

+ 1 - 1
synchro/synchro_import.php

@@ -468,7 +468,7 @@ try
 	   // Prepare insert columns
 		$sInsertColumns = '`'.implode('`, `', $aInputColumns).'`';
 	
-		$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey().'_'.$oConfig->GetDBName().'_'.$oConfig->GetDBSubname());
+		$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey().'_'.MetaModel::GetConfig()->GetDBName().'_'.MetaModel::GetConfig()->GetDBSubname());
 		$oMutex->Lock();
 		foreach($aData as $iRow => $aRow)
 	  	{

+ 1 - 1
synchro/synchrodatasource.class.inc.php

@@ -2415,7 +2415,7 @@ class SynchroExecution
 
 		self::$m_oCurrentTask = $this->m_oDataSource;
 
-		$oMutex = new iTopMutex('synchro_process_'.$this->m_oDataSource->GetKey().'_'.$oConfig->GetDBName().'_'.$oConfig->GetDBSubname());
+		$oMutex = new iTopMutex('synchro_process_'.$this->m_oDataSource->GetKey().'_'.MetaModel::GetConfig()->GetDBName().'_'.MetaModel::GetConfig()->GetDBSubname());
 		try
 		{
 			$oMutex->Lock();