diff --git a/adm/theme_preview.php b/adm/theme_preview.php index 4ec2521ab..208e0de53 100644 --- a/adm/theme_preview.php +++ b/adm/theme_preview.php @@ -100,29 +100,31 @@ for($i=1; $i<=5; $i++) { $default['de_mimg_width'] = (isset($tconfig['de_mimg_width']) && $tconfig['de_mimg_width']) ? $tconfig['de_mimg_width'] : $default['de_mimg_width']; $default['de_mimg_height'] = (isset($tconfig['de_mimg_height']) && $tconfig['de_mimg_height']) ? $tconfig['de_mimg_height'] : $default['de_mimg_height']; -// 테마 경로 설정 -if(defined('G5_THEME_PATH')) { - define('G5_THEME_SHOP_PATH', G5_THEME_PATH.'/'.G5_SHOP_DIR); - define('G5_THEME_SHOP_URL', G5_THEME_URL.'/'.G5_SHOP_DIR); - define('G5_THEME_MSHOP_PATH', G5_THEME_PATH.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR); - define('G5_THEME_MSHOP_URL', G5_THEME_URL.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR); -} +if (defined('G5_USE_SHOP') && G5_USE_SHOP) { + // 테마 경로 설정 + if(defined('G5_THEME_PATH')) { + define('G5_THEME_SHOP_PATH', G5_THEME_PATH.'/'.G5_SHOP_DIR); + define('G5_THEME_SHOP_URL', G5_THEME_URL.'/'.G5_SHOP_DIR); + define('G5_THEME_MSHOP_PATH', G5_THEME_PATH.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR); + define('G5_THEME_MSHOP_URL', G5_THEME_URL.'/'.G5_MOBILE_DIR.'/'.G5_SHOP_DIR); + } -// 스킨 경로 설정 -if(preg_match('#^theme/(.+)$#', $default['de_shop_skin'], $match)) { - define('G5_SHOP_SKIN_PATH', G5_THEME_PATH.'/'.G5_SKIN_DIR.'/shop/'.$match[1]); - define('G5_SHOP_SKIN_URL', G5_THEME_URL .'/'.G5_SKIN_DIR.'/shop/'.$match[1]); -} else { - define('G5_SHOP_SKIN_PATH', G5_PATH.'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_skin']); - define('G5_SHOP_SKIN_URL', G5_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_skin']); -} + // 스킨 경로 설정 + if(preg_match('#^theme/(.+)$#', $default['de_shop_skin'], $match)) { + define('G5_SHOP_SKIN_PATH', G5_THEME_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]); + define('G5_SHOP_SKIN_URL', G5_THEME_URL .'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]); + } else { + define('G5_SHOP_SKIN_PATH', G5_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_skin']); + define('G5_SHOP_SKIN_URL', G5_URL .'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_skin']); + } -if(preg_match('#^theme/(.+)$#', $default['de_shop_mobile_skin'], $match)) { - define('G5_MSHOP_SKIN_PATH', G5_THEME_MOBILE_PATH.'/'.G5_SKIN_DIR.'/shop/'.$match[1]); - define('G5_MSHOP_SKIN_URL', G5_THEME_URL .'/'.G5_MOBILE_DIR.'/'.G5_SKIN_DIR.'/shop/'.$match[1]); -} else { - define('G5_MSHOP_SKIN_PATH', G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_mobile_skin']); - define('G5_MSHOP_SKIN_URL', G5_MOBILE_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_mobile_skin']); + if(preg_match('#^theme/(.+)$#', $default['de_shop_mobile_skin'], $match)) { + define('G5_MSHOP_SKIN_PATH', G5_THEME_MOBILE_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]); + define('G5_MSHOP_SKIN_URL', G5_THEME_URL .'/'.G5_MOBILE_DIR.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$match[1]); + } else { + define('G5_MSHOP_SKIN_PATH', G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_mobile_skin']); + define('G5_MSHOP_SKIN_URL', G5_MOBILE_URL .'/'.G5_SKIN_DIR.'/'.G5_SHOP_DIR.'/'.$default['de_shop_mobile_skin']); + } } $conf = sql_fetch(" select cf_theme from {$g5['config_table']} "); diff --git a/mobile/head.php b/mobile/head.php index cb0602b51..eea8aabe7 100644 --- a/mobile/head.php +++ b/mobile/head.php @@ -68,7 +68,9 @@ include_once(G5_LIB_PATH.'/popular.lib.php'); if ($i == 0) { ?>