diff --git a/upload/source/admincp/admincp_styles.php b/upload/source/admincp/admincp_styles.php index 0e1d568..74e7fd8 100644 --- a/upload/source/admincp/admincp_styles.php +++ b/upload/source/admincp/admincp_styles.php @@ -171,7 +171,7 @@ if($operation == 'admin') { $isdefault3 = $id == $defaultid3 ? 'checked' : ''; $mobile1exists = file_exists($style['directory'].'/mobile'); $d1exists = file_exists($style['directory'].'/mobile'); - $d2exists = file_exists($style['directory'].'/touch'); + $d2exists = file_exists($style['directory'].'/touch') || file_exists($style['directory'].'/m'); $d3exists = file_exists($style['directory'].'/wml'); $available = $style['available'] ? 'checked' : NULL; $preview = file_exists($style['directory'].'/preview.jpg') ? $style['directory'].'/preview.jpg' : './static/image/admincp/stylepreview.gif'; diff --git a/upload/source/class/discuz/discuz_application.php b/upload/source/class/discuz/discuz_application.php index 6208012..4f58e95 100644 --- a/upload/source/class/discuz/discuz_application.php +++ b/upload/source/class/discuz/discuz_application.php @@ -712,6 +712,10 @@ class discuz_application extends discuz_base{ $this->var['cache']['style_default']['styleid'] = $styleid = $this->var['category']['styleid']; } } + + if($this->var['setting']['mobile']['allowmnew'] && !defined('IN_MOBILE_API') && $this->var['setting']['styleid2']) { + $styleid = $this->var['setting']['styleid2']; + } $styleid = intval($styleid);