Merge branch 'dev' of 47.111.118.107:/srv/git/platform

Application/Home/View/default/Home/promitionofregestion.html

@@ -209,7 +209,7 @@
               }
           } else {
               if (is_ios()) {
-                  if (Boolean(navigator.userAgent.match(/OS [1][3]_[1][_\d]* like Mac OS X/i))) {
+                  if (!Boolean(navigator.userAgent.match(/OS [1][3]_[1][_\d]* like Mac OS X/i))) {
                       if (parseInt("{:I('get.status')}") > 0) {
                           location.href = "{:U('iosDown',array('gid'=>$gameId,'pid'=>I('get.pid'),'status'=>1))}";
                           return false;