From db3fb20a522d9fb1f744a1150fb26e17f79c0ed7 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 27 Dec 2022 22:54:31 +0900 Subject: [PATCH 1/2] Fix optional parameter before required parameter --- modules/editor/editor.model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index ab72aa252..9dedaaa4e 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -280,7 +280,7 @@ class editorModel extends editor * 2 types of editors supported; document and comment. * 2 types of editors can be used on a single module. For instance each for original post and reply port. */ - public static function getModuleEditor($type = 'document', $module_srl, $upload_target_srl, $primary_key_name, $content_key_name) + public static function getModuleEditor($type, $module_srl, $upload_target_srl, $primary_key_name, $content_key_name) { // Get editor settings of the module $editor_config = self::getEditorConfig($module_srl); From 3761f92cefcb3a8d0d3e3dc55b3e746587b88e43 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 27 Dec 2022 22:54:52 +0900 Subject: [PATCH 2/2] Fix type error when legacy methods are called with inappropriate types --- modules/admin/admin.admin.model.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index d7242646a..852808fe9 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -140,32 +140,32 @@ class AdminAdminModel extends Admin */ public static function getFavoriteList($site_srl = 0, $add_module_info = false) { - return Rhymix\Modules\Admin\Models\Favorite::getFavorites($add_module_info); + return Rhymix\Modules\Admin\Models\Favorite::getFavorites(!!$add_module_info); } public static function isExistsFavorite($site_srl, $module) { - return Rhymix\Modules\Admin\Models\Favorite::isFavorite($module); + return Rhymix\Modules\Admin\Models\Favorite::isFavorite(strval($module)); } public static function getFaviconUrl($domain_srl = 0) { - return Rhymix\Modules\Admin\Models\Icon::getFaviconUrl($domain_srl); + return Rhymix\Modules\Admin\Models\Icon::getFaviconUrl(intval($domain_srl)); } public static function getMobileIconUrl($domain_srl = 0) { - return Rhymix\Modules\Admin\Models\Icon::getMobiconUrl($domain_srl); + return Rhymix\Modules\Admin\Models\Icon::getMobiconUrl(intval($domain_srl)); } public static function getSiteDefaultImageUrl($domain_srl = 0, &$width = 0, &$height = 0) { - return Rhymix\Modules\Admin\Models\Icon::getDefaultImageUrl($domain_srl, $width, $height); + return Rhymix\Modules\Admin\Models\Icon::getDefaultImageUrl(intval($domain_srl), $width, $height); } public static function iconUrlCheck($iconname, $default_icon_name, $domain_srl) { - return Rhymix\Modules\Admin\Models\Icon::getIconUrl($domain_srl, $iconname); + return Rhymix\Modules\Admin\Models\Icon::getIconUrl(intval($domain_srl), $iconname); } public static function getSFTPPath()