g5 merge 충돌 수정

2014-03-21 10:21:17 +09:00
parent bbc71a0bb6 1e84bc6f1d
commit a8b82fa900
7 changed files with 29 additions and 10 deletions
--- a/bbs/faq.php
+++ b/bbs/faq.php
@ -73,7 +73,7 @@ if(is_file($skin_file)) {

    if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)

-    $page_rows = G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'];
+    $page_rows = G5_IS_MOBILE ? $config['cf_mobile_page_rows'] : $config['cf_page_rows'];

    $sql = " select count(*) as cnt
                from {$g5['faq_table']}