Merge remote-tracking branch 'origin/support/2.7.0' into support/2.7

# Conflicts:
#	datamodels/2.x/itop-attachments/renderers.itop-attachments.php
This commit is contained in:
Pierre Goiffon
2020-04-29 09:00:10 +02:00
7 changed files with 63 additions and 47 deletions

View File

@@ -223,9 +223,9 @@ class DBObjectSearch extends DBSearch
public function RenameAlias($sOldName, $sNewName)
{
$bFound = false;
if (array_key_exists($sOldName, $this->m_aClasses))
if (!array_key_exists($sOldName, $this->m_aClasses))
{
$bFound = true;
return false;
}
if (array_key_exists($sNewName, $this->m_aClasses))
{