REFACTORING #1880 @4h30m: another ugly refactoring commit

This commit is contained in:
Michal Kváček
2016-10-25 16:50:04 +02:00
parent 28f67ffe3c
commit cc999dd24e
71 changed files with 827 additions and 608 deletions
+4 -4
View File
@@ -26,12 +26,12 @@ class ModuleManager extends ServiceProvider
// iterate over all modules and enable or disable them
foreach ($modules as $module) {
$module->module_settings = json_decode($module->module_settings);
$module->moduleSettings = json_decode($module->moduleSettings);
if ($module->is_template) {
if (isset($module->module_settings->providers) && !empty($module->module_settings->providers)) {
foreach ($module->module_settings->providers as $provider) {
if (isset($module->moduleSettings->providers) && !empty($module->moduleSettings->providers)) {
foreach ($module->moduleSettings->providers as $provider) {
$this->app->register($provider);
}
}
@@ -61,7 +61,7 @@ class ModuleManager extends ServiceProvider
*/
private function createModulesJson(Module $module)
{
$config = $module->module_settings;
$config = $module->moduleSettings;
if (is_null($config)) {
return;