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
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

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);