Merge branch 'g5'

This commit is contained in:
chicpro
2013-11-18 18:22:32 +09:00
2 changed files with 23 additions and 18 deletions

View File

@ -40,9 +40,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</div> </div>
<?php <?php
$seq = 0; if(G5_USE_MOBILE && G5_IS_MOBILE) {
$href = $_SERVER['PHP_SELF']; $seq = 0;
if($_SERVER['QUERY_STRING']) { $href = $_SERVER['PHP_SELF'];
if($_SERVER['QUERY_STRING']) {
$sep = '?'; $sep = '?';
foreach($_GET as $key=>$val) { foreach($_GET as $key=>$val) {
if($key == 'device') if($key == 'device')
@ -52,15 +53,19 @@ if($_SERVER['QUERY_STRING']) {
$sep = '&amp;'; $sep = '&amp;';
$seq++; $seq++;
} }
} }
if($seq) if($seq)
$href .= '&amp;device=pc'; $href .= '&amp;device=pc';
else else
$href .= '?device=pc'; $href .= '?device=pc';
?> ?>
<a href="<?php echo $href; ?>" id="device_change">PC 버전으로 보기</a> <a href="<?php echo $href; ?>" id="device_change">PC 버전으로 보기</a>
<?php <?php
}
if ($config['cf_analytics']) {
echo $config['cf_analytics'];
}
include_once(G5_PATH."/tail.sub.php"); include_once(G5_PATH."/tail.sub.php");
?> ?>

View File

@ -35,7 +35,7 @@ if ($config['cf_include_tail']) {
</div> </div>
<?php <?php
if(!G5_IS_MOBILE) { if(G5_USE_MOBILE && !G5_IS_MOBILE) {
$seq = 0; $seq = 0;
$href = $_SERVER['PHP_SELF']; $href = $_SERVER['PHP_SELF'];
if($_SERVER['QUERY_STRING']) { if($_SERVER['QUERY_STRING']) {