Merge branch 'hotfix/unionData' into 'gray'

union data to json



See merge request !13

@@ -706,11 +706,16 @@ class IndexController extends AbstractAction
                     /* 检查联盟参数是否有效 */
                     $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
                 } else {
-                    $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] .
-                        (empty($_COOKIE['union_data']) ? '' : ',"union_data":' . $_COOKIE['union_data']) . '}';
+                    $unionObj = array("client_id" => $_COOKIE['mkt_code']);
+
+                    if (!empty($_COOKIE['union_data'])) {
+                        $unionObj = array_merge($unionObj, array("union_data" => $_COOKIE['union_data']));
+                    }
+
+                    $unionKey = json_encode($unionObj);
 
                     /* 检查联盟参数是否有效 */
-                    $unionInfo = json_decode('{"client_id":' . $_COOKIE['mkt_code'] . '}', true);
+                    $unionInfo = array("client_id" => $_COOKIE['mkt_code']);
                 }
 
                 /* 模拟APP的User-Agent */