diff --git a/config/func.inc.php b/config/func.inc.php index b136c7b44..16a617261 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -127,7 +127,13 @@ **/ function zdate($str, $format = "Y-m-d H:i:s") { if(!$str) return; - return date($format, mktime(substr($str,8,2), substr($str,10,2), substr($str,12,2), substr($str,4,2), substr($str,6,2), substr($str,0,4))); + $hour = (int)substr($str,8,2); + $min = (int)substr($str,10,2); + $sec = (int)substr($str,12,2); + $year = (int)substr($str,0,4); + $month = (int)substr($str,4,2); + $day = (int)substr($str,6,2); + return date($format, mktime($hour, $min, $sec, $month?$month:1, $day?$day:1, $year)); } /** diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php index 3f6b0f6cf..64b03b6fd 100644 --- a/modules/blog/blog.view.php +++ b/modules/blog/blog.view.php @@ -165,7 +165,14 @@ // 검색 옵션 $args->search_target = trim(Context::get('search_target')); ///< 검색대상 $args->search_keyword = trim(Context::get('search_keyword')); ///< 검색어 - if($args->search_keyword && !$args->search_target) $args->search_target = "title_content"; ///< 검색 고정 + + // 키워드 검색이 아닌 검색일 경우 목록의 수를 40개로 고정 + if($args->search_target && $args->search_keyword) $args->list_count = 40; + + // 키워드 검색의 경우 제목,내용으로 검색 대상 고정 + if($args->search_keyword && !$args->search_target) $args->search_target = "title_content"; + + // 블로그 카테고리 $args->category_srl = $this->category_srl; $args->sort_index = 'list_order'; ///< 소팅 값 diff --git a/modules/blog/skins/default/list.html b/modules/blog/skins/default/list.html index 9631e5453..3255a8e7e 100644 --- a/modules/blog/skins/default/list.html +++ b/modules/blog/skins/default/list.html @@ -2,11 +2,29 @@