From 8e7805d105dfcbb7ecbb4335aae8d85f08da635c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 20 Dec 2013 17:29:51 +0900
Subject: [PATCH 1/2] =?UTF-8?q?qa=5Fcontent=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20text=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/qa_config.php     | 8 +++++++-
 install/gnuboard5.sql | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/adm/qa_config.php b/adm/qa_config.php
index 8856a8ff9..f3e297e02 100644
--- a/adm/qa_config.php
+++ b/adm/qa_config.php
@@ -57,7 +57,7 @@ if(!sql_query(" DESCRIBE `{$g5['qa_config_table']}` ", false)) {
                   `qa_sms_recv` tinyint(4) NOT NULL DEFAULT '0',
                   `qa_html` tinyint(4) NOT NULL DEFAULT '0',
                   `qa_subject` varchar(255) NOT NULL DEFAULT '',
-                  `qa_content` varchar(255) NOT NULL DEFAULT '',
+                  `qa_content` text NOT NULL,
                   `qa_status` tinyint(4) NOT NULL DEFAULT '0',
                   `qa_file1` varchar(255) NOT NULL DEFAULT '',
                   `qa_source1` varchar(255) NOT NULL DEFAULT '',
@@ -75,6 +75,12 @@ if(!sql_query(" DESCRIBE `{$g5['qa_config_table']}` ", false)) {
                 )", true);
 }
 
+$sql = " SHOW COLUMNS FROM `{$g5['qa_content_table']}` LIKE 'qa_content' ";
+$row = sql_fetch($sql);
+if(strpos($row['Type'], 'text') === false) {
+    sql_query(" ALTER TABLE `{$g5['qa_content_table']}` CHANGE `qa_content` `qa_content` text NOT NULL ", true);
+}
+
 $qaconfig = get_qa_config();
 
 if(empty($qaconfig)) {
diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index 55e826937..7b7307b72 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -762,7 +762,7 @@ CREATE TABLE IF NOT EXISTS `g5_qa_content` (
   `qa_sms_recv` tinyint(4) NOT NULL DEFAULT '0',
   `qa_html` tinyint(4) NOT NULL DEFAULT '0',
   `qa_subject` varchar(255) NOT NULL DEFAULT '',
-  `qa_content` varchar(255) NOT NULL DEFAULT '',
+  `qa_content` text NOT NULL,
   `qa_status` tinyint(4) NOT NULL DEFAULT '0',
   `qa_file1` varchar(255) NOT NULL DEFAULT '',
   `qa_source1` varchar(255) NOT NULL DEFAULT '',

From 5e462f681683191b6139efd70b49c8ae6b3d677f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 23 Dec 2013 10:08:45 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=8B=9C=20=EC=A7=80=EB=B2=88=EC=A3=BC?=
 =?UTF-8?q?=EC=86=8C=20=EC=B4=88=EA=B8=B0=ED=99=94=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/member_form.php                             | 2 +-
 mobile/skin/member/basic/register_form.skin.php | 4 ++--
 skin/member/basic/register_form.skin.php        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/adm/member_form.php b/adm/member_form.php
index e5b9228aa..e7e73ee03 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -208,7 +208,7 @@ include_once('./admin.head.php');
             <a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_jibeon=mb_addr_jibeon" id="win_zip" class="win_zip_find btn_frmline" target="_blank">주소 검색</a><br>
             <input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" title="행정기본주소" class="frm_input readonly" size="70"><br>
             <input type="text" name="mb_addr2" value="<?php echo $mb['mb_addr2'] ?>" id="mb_addr2" title="상세주소" class="frm_input" size="70">
-            <input type="hidden" name="mb_addr_jibeon" value=""><br>
+            <input type="hidden" name="mb_addr_jibeon" value="<?php echo $mb['mb_addr_jibeon']; ?>"><br>
             <span id="mb_addr_jibeon">지번주소 : <?php echo $mb['mb_addr_jibeon']; ?></span>
         </td>
     </tr>
diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php
index b32210463..26db27ef1 100644
--- a/mobile/skin/member/basic/register_form.skin.php
+++ b/mobile/skin/member/basic/register_form.skin.php
@@ -149,8 +149,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
                 <input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="50">
                 <label for="reg_mb_addr2" class="sound_only">상세주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
                 <input type="text" name="mb_addr2" value="<?php echo $member['mb_addr2'] ?>" id="reg_mb_addr2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="50">
-                <input type="hidden" name="mb_addr_jibeon" value="">
-                <span id="mb_addr_jibeon"></span>
+                <input type="hidden" name="mb_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>">
+                <span id="mb_addr_jibeon"><?php echo ($member['mb_addr_jibeon'] ? '지번주소 : '.$member['mb_addr_jibeon'] : ''); ?></span>
             </td>
         </tr>
         <?php } ?>
diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php
index ef723a1dd..0736c2c4b 100644
--- a/skin/member/basic/register_form.skin.php
+++ b/skin/member/basic/register_form.skin.php
@@ -154,8 +154,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
                 <input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="70">
                 <label for="reg_mb_addr2" class="sound_only">상세주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
                 <input type="text" name="mb_addr2" value="<?php echo $member['mb_addr2'] ?>" id="reg_mb_addr2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="70">
-                <input type="hidden" name="mb_addr_jibeon" value="">
-                <span id="mb_addr_jibeon"></span>
+                <input type="hidden" name="mb_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>">
+                <span id="mb_addr_jibeon"><?php echo ($member['mb_addr_jibeon'] ? '지번주소 : '.$member['mb_addr_jibeon'] : ''); ?></span>
             </td>
         </tr>
         <?php }  ?>