From 6f8e7c7002c04560c58e356f07b3e9af7b8d47ce Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Tue, 25 Jul 2023 17:20:37 +0200 Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B03454=20-=20MoveToProd=20in=202=20ste?= =?UTF-8?q?ps=20-=20fix=20utils::GetCurrentModuleUrl()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/utils.inc.php | 2 +- sources/Service/Module/ModuleService.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index 2746aff09..3a4f99393 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -1978,7 +1978,7 @@ class utils */ public static function GetCurrentModuleUrl() { - return ModuleService::GetInstance()->GetCurrentModuleUrl(); + return ModuleService::GetInstance()->GetCurrentModuleUrl(1); } /** diff --git a/sources/Service/Module/ModuleService.php b/sources/Service/Module/ModuleService.php index 5370f7bbe..c41961c1a 100644 --- a/sources/Service/Module/ModuleService.php +++ b/sources/Service/Module/ModuleService.php @@ -117,9 +117,9 @@ class ModuleService * * @uses GetCurrentModuleDir */ - public function GetCurrentModuleUrl(): string + public function GetCurrentModuleUrl(int $iCallDepth = 0): string { - $sDir = $this->GetCurrentModuleDir(1); + $sDir = $this->GetCurrentModuleDir(1 + $iCallDepth); if ( $sDir !== '') { return utils::GetAbsoluteUrlModulesRoot().'/'.$sDir; From 5475b9fbbee9b2dfab05293ebe202654339a5d2f Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Tue, 25 Jul 2023 17:44:43 +0200 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B03454=20-=20MoveToProd=20in=202=20ste?= =?UTF-8?q?ps=20-=20fix=20utils::GetCurrentModuleName()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/utils.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index 3a4f99393..ba9d3160c 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -1947,7 +1947,7 @@ class utils */ public static function GetCurrentModuleName($iCallDepth = 0) { - return ModuleService::GetInstance()->GetCurrentModuleName($iCallDepth = 0); + return ModuleService::GetInstance()->GetCurrentModuleName($iCallDepth + 1); } /**