Merge branch 'hotfix/unionData' into 'gray'

union_data 参数 json_decode 单独独立出来 See merge request !12

Merge branch 'hotfix/unionData' into 'gray'
union_data 参数 json_decode 单独独立出来 See merge request !12
郝肖肖
Commit 37508642cc4ed97710daa6a47fd89a758bfd4281 2 parents 7a9b37e6 41b2b0a6
Showing 1 changed file with 6 additions and 2 deletions
yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
--- a/yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @3750864
+++ b/yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @3750864
@@ -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;