From 2966fded9178d2afa95319def16277ba0a6aef07 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Wed, 16 May 2012 07:18:16 +0000
Subject: [PATCH] reverse merge from 1.6.0 (r10667)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10684 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/lang.xml                               | 4 ++++
 modules/communication/communication.controller.php | 8 +++++---
 modules/communication/skins/default/friends.html   | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/lang/lang.xml b/common/lang/lang.xml
index 59598bf1e..c557b7626 100644
--- a/common/lang/lang.xml
+++ b/common/lang/lang.xml
@@ -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>
diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index 5fac8f36d..4339895cb 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -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);
diff --git a/modules/communication/skins/default/friends.html b/modules/communication/skins/default/friends.html
index 91b835e94..42019b88c 100644
--- a/modules/communication/skins/default/friends.html
+++ b/modules/communication/skins/default/friends.html
@@ -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>