FuzeWorks/Core
FuzeWorks/Core
1
0
Fork 0
Code Issues 9 Pull Requests Packages Releases Activity

Messages when a module is already loaded, and loaded modules get correctly registered

Browse Source
This commit is contained in:
Abel Hoogeveen 2015-04-22 12:16:14 +02:00
parent e877d103c8
commit ba84fa5cef
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Core/System/class.core.php
View File

@ -92,7 +92,9 @@ class Core {
// Check if the module is already loaded. If so, only return a reference, if not, load the module // Check if the module is already loaded. If so, only return a reference, if not, load the module
if (in_array($name, $this->loaded_modules)) { if (in_array($name, $this->loaded_modules)) {
// return the link // return the link
$c = &$this->mods->{strtolower($cfg->name)}; $msg = "Module '".ucfirst((isset($cfg->name) ? $cfg->name : $cfg->module_name)) . "' is already loaded";
$this->mods->logger->log($msg);
$c = &$this->mods->{strtolower($cfg->module_name)};
return $c; return $c;
} else { } else {
// Load the module // Load the module
@ -144,11 +146,12 @@ class Core {
} }
$CLASS->onLoad(); $CLASS->onLoad();
// Add to the loaded modules
$this->loaded_modules[] = $name;
// Return a reference // Return a reference
return $this->mods->{strtolower($cfg->module_name)} = &$CLASS; return $this->mods->{strtolower($cfg->module_name)} = &$CLASS;
} }
} }
} }
} }