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

reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:27:55 +00:00
parent a4b3a914a5
commit f7330acf02
13 changed files with 137 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/communication/communication.controller.php
View file

@ -325,10 +325,12 @@
$logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl;
// Check variables
$friend_srl_list = trim(Context::get('friend_srl_list'));
if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null');
$friend_srl_list = Context::get('friend_srl_list');
$friend_srl_list = explode('|@|', $friend_srl_list);
if(!is_array($friend_srl_list))
{
$friend_srl_list = explode('|@|', $friend_srl_list);
}
if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null');
$friend_count = count($friend_srl_list);

4
modules/communication/skins/default/friends.html
View file

@ -37,7 +37,7 @@
<th>{$lang->friend_group}</th>
<th>{$lang->nick_name}</th>
<th>{$lang->regdate}</th>
<th><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list', { wrap:'fo_friend_list' });" /></th>
<th><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list[]', { wrap:'fo_friend_list' });" /></th>
</tr>
</thead>
<tbody>
@ -45,7 +45,7 @@
<td>{$val->group_title?$val->group_title:"&nbsp;"}</td>
<td><a href="#popup_menu_area" class="member_{$val->target_srl}">{$val->nick_name}</a></td>
<td>{zdate($val->regdate,"Y-m-d")}</td>
<td><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /></td>
<td><input type="checkbox" name="friend_srl_list[]" value="{$val->friend_srl}" /></td>
</tr>
</tbody>
</table>