fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-06-18 13:16:38 +09:00
commit 4cd548cd58
4 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/communication/communication.model.php
View file

@ -378,16 +378,13 @@ class communicationModel extends communication
$args = new stdClass();
$args->member_srl = $logged_info->member_srl;
$output = executeQueryArray('communication.getFriendGroups', $args);
$group_list = $output->data;
if(!$group_list)
$friend_group_list = array();
foreach ($output->data as $item)
{
return;
$friend_group_list[$item->friend_group_srl] = $item;
}
return $group_list;
return $friend_group_list;
}
/**

9
modules/communication/communication.view.php
View file

@ -294,14 +294,7 @@ class communicationView extends communication
$oCommunicationModel = getModel('communication');
// get a group list
$tmp_group_list = $oCommunicationModel->getFriendGroups();
$group_count = count($tmp_group_list);
for($i = 0; $i < $group_count; $i++)
{
$friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i];
}
$friend_group_list = $oCommunicationModel->getFriendGroups();
Context::set('friend_group_list', $friend_group_list);
// get a list of friends

3
modules/editor/skins/ckeditor/css/default.less
View file

@ -49,9 +49,10 @@
html {
&.cke_panel_container, &.cke_panel_container body {
background-color: #fff;
.light_dark(default);
}
body.cke_editable {
min-height: 100vh;
padding: 10px;
.light_dark(@colorset);
}

5
modules/module/module.controller.php
View file

@ -955,9 +955,8 @@ class moduleController extends module
{
$this->deleteModuleExtraVars($module_srl);
getDestroyXeVars($obj);
if(!$obj || !is_countable($obj) || !count($obj)) return;
foreach($obj as $key => $val)
foreach(get_object_vars($obj) as $key => $val)
{
if(is_object($val) || is_array($val)) continue;