firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-16 09:19:46 +09:00
parent 5759a65cfd ade38bab84
commit f2b184e5b1
56 changed files with 834 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config.php
View File

@ -48,21 +48,19 @@ define('G4_SKIN_DIR', 'skin');
define('G4_GCAPTCHA_DIR', 'gcaptcha');
define('G4_CKEDITOR_DIR', 'ckeditor');
define('G4_MOBILE_DIR', 'mobile');
define('G4_KCP_DIR', 'kcp');
define('G4_KCPCERT_DIR', 'kcpcert');
define('G4_SNS_DIR', 'sns');
define('G4_SYNDI_DIR', 'syndi');
// URL 은 브라우저상에서의 경로 (도메인으로 부터의)
if (G4_DOMAIN) {
define('G4_URL', G4_DOMAIN);
} else {
if (isset($g4_path['url'])) {
if (isset($g4_path['url']))
define('G4_URL', $g4_path['url']);
} else {
else
define('G4_URL', '');
}
}
if (isset($g4_path['path'])) {
define('G4_PATH', $g4_path['path']);
@ -80,7 +78,7 @@ define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR);
define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR);
define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR);
define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로
define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR);
define('G4_KCPCERT_URL', G4_PLUGIN_URL.'/'.G4_KCPCERT_DIR);
define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR);
define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR);
define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR);
@ -95,7 +93,7 @@ define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR);
define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR);
define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR);
define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR);
define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR);
define('G4_KCPCERT_PATH', G4_PLUGIN_PATH.'/'.G4_KCPCERT_DIR);
define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR);
define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR);
define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR);