Merge branch 'hotfix/unionData' into 'gray'

union_data 参数 json_decode 单独独立出来



See merge request !12

@@ -702,13 +702,17 @@ class IndexController extends AbstractAction
                     } else {
                         $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
                     }
+
+                    /* 检查联盟参数是否有效 */
+                    $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
                 } else {
                     $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] .
                         (empty($_COOKIE['union_data']) ? '' : ',"union_data":' . $_COOKIE['union_data']) . '}';
+
+                    /* 检查联盟参数是否有效 */
+                    $unionInfo = json_decode('{"client_id":' . $_COOKIE['mkt_code'] . '}', true);
                 }
 
-                /* 检查联盟参数是否有效 */
-                $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
                 /* 模拟APP的User-Agent */
                 $userAgent = isset($unionInfo['client_id']) ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' . $unionInfo['client_id'] . ';uid/' . $uid . ')' : null;