Merge branch 'moonclub' of git.oschina.net:yiguanjia/php into moonclub

www/webapp/moonclub/views/index/index.php

@@ -51,11 +51,7 @@
     var ua = navigator.userAgent.toLowerCase();
 
     if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-<<<<<<< HEAD
-      var userID = getCookie("wxUserID");
-=======
       var userID = getCookie("xyhwxUserID");
->>>>>>> test
       if (!userID) {
         location.href = '<?php echo Yii::app()->request->baseUrl."/login/wxOpen&redirect_uri=".$current_uri; ?>';
       }