Merge branch 'release/5.4.1' into gray

@@ -1074,7 +1074,7 @@ class CartModel
                         $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
                     }
                 } else {
-                    $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] . ($_COOKIE['union_data'] ? ', union_data: '.$_COOKIE['union_data']: '') . '}';
+                    $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] . ($_COOKIE['union_data'] ? ', union_data: '.addslashes($_COOKIE['union_data']): '') . '}';
                 }
                 /* 检查联盟参数是否有效 */
                 $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);