From f5cc564e428d5bd4803ae8433c2a70006ce89415 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Thu, 7 Feb 2013 18:39:56 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.php         | 4 ++++
 css/default.css    | 8 +++++---
 lib/latest.lib.php | 7 +------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/config.php b/config.php
index 27a6c2977..920d96815 100644
--- a/config.php
+++ b/config.php
@@ -71,6 +71,10 @@ define('G4_GCAPTCHA_PATH', G4_BBS_PATH.'/'.G4_GCAPTCHA_DIR);
 define('G4_CKEDITOR_PATH', G4_BBS_PATH.'/'.G4_CKEDITOR_DIR);
 //==============================================================================
 
+
+define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부
+
+
 // 시간 상수
 // 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요.
 // 하루는 86400 초입니다. 1시간은 3600초
diff --git a/css/default.css b/css/default.css
index 41204967a..dc0b5f114 100644
--- a/css/default.css
+++ b/css/default.css
@@ -13,7 +13,9 @@ p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
 hr {display:none}
 pre {overflow-x:scroll;font-size:1.1em}
 a:link, a:visited {color:#000;text-decoration:none}
-a:hover, a:focus, a:active {color:#0e99ea;text-decoration:underline}
+a:hover,
+a:focus,
+a:active {color:#0e99ea;text-decoration:underline}
 
 /* 화면낭독기 사용자용 */
 .sound_only {display:inline-block !important;margin:0 !important;padding:0 !important;width:0 !important;height:0 !important;border:0 !important;overflow:hidden !important}
@@ -101,7 +103,7 @@ a:hover, a:focus, a:active {color:#0e99ea;text-decoration:underline}
 .btn_confirm {text-align:center} /* 서식단계 진행 */
 .btn_submit {padding:0 10px;height:24px;border:0;background:#428ab4;color:#fff;letter-spacing:-0.1em;vertical-align:top}
 .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
-.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#428ab4;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
+.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#428ab4;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
 .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
 .btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer}
 
@@ -287,7 +289,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#428ab4;color:#f
 /* 설문조사 스킨 */
 #poll {}
 #poll header {padding:10px 14px 0}
-#poll header a {color:#428ab4;text-decoration:none}
+#poll header a {color:#428ab4}
 #poll header p {padding:5px 0 10px}
 #poll ul {margin:0 0 10px;padding:5px 14px;list-style:none}
 #poll li {padding:3px 0}
diff --git a/lib/latest.lib.php b/lib/latest.lib.php
index 6a4b4528f..51b71edb3 100644
--- a/lib/latest.lib.php
+++ b/lib/latest.lib.php
@@ -11,12 +11,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
     $latest_skin_url  = G4_SKIN_URL.'/latest/'.$skin_dir;
 
     $cache_file = G4_DATA_PATH."/cache/latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}.php";
-<<<<<<< HEAD
-    //if (!file_exists($cache_file)) {
-    if (1) {
-=======
     if (!G4_USE_CACHE || !file_exists($cache_file)) {
->>>>>>> ddb1dec36c49f24441636f5e3dcb1e1db20a0d2b
         $list = array();
 
         $sql = " select * from {$g4['board_table']} where bo_table = '$bo_table'";
@@ -48,4 +43,4 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
 
     return $content;
 }
-?>
\ No newline at end of file
+?>