g5 merge 충돌수정

2013-12-06 09:00:24 +09:00
parent ccb9a20ddd 808908717d
commit f5b6154ebd
4 changed files with 72 additions and 53 deletions
--- a/head.php
+++ b/head.php
@ -35,7 +35,7 @@ if ($config['cf_include_head']) {
            <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
        </div>

-        <fieldset id="sch">
+        <fieldset id="hd_sch">
            <legend>사이트 내 전체검색</legend>
            <form name="fsearchbox" method="get" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);">
            <input type="hidden" name="sfl" value="wr_subject||wr_content">