env: update loadModule

iTXTech · Jul 16, 2020 · 4033b58 · 4033b58
1 parent e1a78b1
commit 4033b58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/FDWebServer/CGI/env.php b/FDWebServer/CGI/env.php
@@ -48,8 +48,8 @@
 }
 
 function loadModule(ModuleManager $manager, string $name){
- $name = file_exists($name . ".phar") ? ($name . ".phar") : $name;
- $manager->tryLoadModule($manager->getModulePath() . $name);
+ $name = $manager->getModulePath() . $name;
+ $manager->tryLoadModule(file_exists($phar = $name . ".phar") ? $phar : $name);
 }
 
 if($moduleManager->getModule("FlashDetector") === null){

diff --git a/Scripts/env.php b/Scripts/env.php
@@ -49,8 +49,8 @@
 }
 
 function loadModule(ModuleManager $manager, string $name){
- $name = file_exists($name . ".phar") ? ($name . ".phar") : $name;
- $manager->tryLoadModule($manager->getModulePath() . $name);
+ $name = $manager->getModulePath() . $name;
+ $manager->tryLoadModule(file_exists($phar = $name . ".phar") ? $phar : $name);
 }
 
 if($moduleManager->getModule("FlashDetector") === null){