fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Kijin Sung 2022-12-27 23:07:10 +09:00
commit 4fe893ee86
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/admin/admin.admin.model.php
View file

@ -140,32 +140,32 @@ class AdminAdminModel extends Admin
*/ */
public static function getFavoriteList($site_srl = 0, $add_module_info = false) 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) 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) 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) 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) 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) 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() public static function getSFTPPath()

2
modules/editor/editor.model.php
View file

@ -280,7 +280,7 @@ class editorModel extends editor
* 2 types of editors supported; document and comment. * 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. * 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 // Get editor settings of the module
$editor_config = self::getEditorConfig($module_srl); $editor_config = self::getEditorConfig($module_srl);