diff --git a/modules/board/tpl/addition_setup.html b/modules/board/tpl/addition_setup.html index 78b6214e4..954d0c56e 100644 --- a/modules/board/tpl/addition_setup.html +++ b/modules/board/tpl/addition_setup.html @@ -28,15 +28,15 @@
- {$lang->unit_day} + {$lang->unit_day}

{$lang->about_board_include_days}

- - + +
diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html index f3b8ccbd9..511ede86e 100644 --- a/modules/board/tpl/board_insert.html +++ b/modules/board/tpl/board_insert.html @@ -9,7 +9,7 @@ - +
@@ -201,7 +201,7 @@

{$lang->about_list_config}


diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html index 06adc1961..9da9cc4ed 100644 --- a/modules/editor/tpl/editor_module_config.html +++ b/modules/editor/tpl/editor_module_config.html @@ -147,8 +147,8 @@ {$fontname_simplified} diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index 6c2c60e69..982c4502c 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -172,6 +172,7 @@ class ModuleAdminModel extends Module $grant_list->manager->default = 'manager'; Context::set('grant_list', $grant_list); // Get a permission group granted to the current module + $selected_group = array(); $default_grant = array(); $args = new stdClass(); $args->module_srl = $module_srl; @@ -375,21 +376,24 @@ class ModuleAdminModel extends Module $skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl); } - if($skin_info->extra_vars) + if($skin_info && $skin_info->extra_vars) { foreach($skin_info->extra_vars as $key => $val) { $group = $val->group; $name = $val->name; $type = $val->type; - if($skin_vars[$name]) + if (isset($skin_vars[$name]) && $skin_vars[$name]) { $value = $skin_vars[$name]->value; } - else $value = ''; - if($type=="checkbox") + else { - $value = $value?unserialize($value):array(); + $value = ''; + } + if ($type === 'checkbox') + { + $value = $value ? unserialize($value) : []; } $value = empty($value) ? $val->default : $value; diff --git a/modules/module/module.model.php b/modules/module/module.model.php index a1668b007..f15de98ca 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -424,14 +424,14 @@ class ModuleModel extends Module * * @param stdClass $moduleInfo Module information */ - private static function _applyDefaultSkin(&$module_info) + private static function _applyDefaultSkin($module_info) { - if($module_info->is_skin_fix == 'N') + if(isset($module_info->is_skin_fix) && $module_info->is_skin_fix == 'N') { $module_info->skin = '/USE_DEFAULT/'; } - if($module_info->is_mskin_fix == 'N' && $module_info->mskin !== '/USE_RESPONSIVE/') + if(isset($module_info->is_mskin_fix) && $module_info->is_mskin_fix == 'N' && $module_info->mskin !== '/USE_RESPONSIVE/') { $module_info->mskin = '/USE_DEFAULT/'; } diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html index 9c6aab3ac..dc4557465 100644 --- a/modules/module/tpl/module_grants.html +++ b/modules/module/tpl/module_grants.html @@ -58,16 +58,16 @@
@@ -90,10 +90,10 @@
- + - + - +
@@ -28,14 +28,14 @@
- +

{$lang->about_feed_description}

- +

{$lang->about_feed_copyright}