mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-06 02:01:40 +09:00
reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
a4b3a914a5
commit
f7330acf02
13 changed files with 137 additions and 144 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue