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

reverse merge from 1.6.0 (r10667)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10684 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-16 07:18:16 +00:00
parent b52d9f1129
commit 2966fded91
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/lang/lang.xml
View file

@ -3002,6 +3002,10 @@ Xin vui lòng kiểm tra lại thông tin Database.]]></value>
<value xml:lang="zh-TW"><![CDATA[註冊失敗。]]></value>
<value xml:lang="de"><![CDATA[Misserfolg der Registrierung]]></value>
</item>
<item name="fail_to_update">
<value xml:lang="ko"><![CDATA[수정하지 못했습니다.]]></value>
<value xml:lang="en"><![CDATA[Fail to update.]]></value>
</item>
<item name="fail_to_delete">
<value xml:lang="ko"><![CDATA[삭제 실패했습니다.]]></value>
<value xml:lang="en"><![CDATA[Failed to delete.]]></value>

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>