Merge branch 'develop' into test
Showing
1 changed file
with
2 additions
and
1 deletions
@@ -30,7 +30,7 @@ class HomeController extends AbstractAction | @@ -30,7 +30,7 @@ class HomeController extends AbstractAction | ||
30 | { | 30 | { |
31 | $uid = $this->getUid($useSession); | 31 | $uid = $this->getUid($useSession); |
32 | if (!$uid) { | 32 | if (!$uid) { |
33 | - $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/')))); | 33 | + $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN)))); |
34 | } | 34 | } |
35 | } | 35 | } |
36 | 36 | ||
@@ -806,6 +806,7 @@ class HomeController extends AbstractAction | @@ -806,6 +806,7 @@ class HomeController extends AbstractAction | ||
806 | ), | 806 | ), |
807 | ), | 807 | ), |
808 | 'orderCode' => $orderCode, | 808 | 'orderCode' => $orderCode, |
809 | + 'hasWxShare' => strpos($this->_request->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false | ||
809 | )); | 810 | )); |
810 | } | 811 | } |
811 | 812 |
-
Please register or login to post a comment