From d5c0202094dd6aeb0bc671beeac9215169eaf93d Mon Sep 17 00:00:00 2001 From: Molkobain Date: Mon, 31 Dec 2018 14:37:18 +0100 Subject: [PATCH] =?UTF-8?q?(Cherry=20pick=20from=20875b902)=20N=C2=B01917?= =?UTF-8?q?=20Setup:=20Fix=20warnings=20when=20upgrading=20an=20extension?= =?UTF-8?q?=20with=20an=20extension.xml=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup/extensionsmap.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php index 2736704f85..2ee65f6581 100644 --- a/setup/extensionsmap.class.inc.php +++ b/setup/extensionsmap.class.inc.php @@ -308,12 +308,12 @@ class iTopExtensionsMap $sModuleVersion = '0.0.1'; } - if ($sParentExtensionId !== null) + if (($sParentExtensionId !== null) && (array_key_exists($sParentExtensionId, $this->aExtensions)) && ($this->aExtensions[$sParentExtensionId] instanceof iTopExtension)) { // Already inside an extension, let's add this module the list of modules belonging to this extension $this->aExtensions[$sParentExtensionId]->aModules[] = $sModuleName; $this->aExtensions[$sParentExtensionId]->aModuleVersion[$sModuleName] = $sModuleVersion; - } + } else { // Not already inside an folder containing an 'extension.xml' file