Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion modules/system/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
use Validator;
use View;
use Winter\Storm\Router\Helper as RouterHelper;
use Winter\Storm\Support\ClassLoader;
use Winter\Storm\Support\ModuleServiceProvider;

class ServiceProvider extends ModuleServiceProvider
Expand All @@ -37,6 +38,14 @@ public function register()
{
parent::register();

$modules = Config::get('cms.loadModules', []);
$classLoader = $this->app->make(ClassLoader::class);
foreach ($modules as $module) {
if (strtolower(trim($module)) != 'system') {
$classLoader->autoloadPackage($module . '\\', "modules/" . strtolower($module) . '/');
}
}

$this->registerSingletons();
$this->registerPrivilegedActions();

Expand All @@ -58,7 +67,7 @@ public function register()
/*
* Register other module providers
*/
foreach (Config::get('cms.loadModules', []) as $module) {
foreach ($modules as $module) {
if (strtolower(trim($module)) != 'system') {
$this->app->register('\\' . $module . '\ServiceProvider');
}
Expand Down