From 3b8c7645440cd8f7f634163531435f2615ee4c8a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 29 Mar 2018 02:38:04 +0900
Subject: [PATCH] =?UTF-8?q?install=5Fdb=20=EA=B3=BC=EC=A0=95=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=A6=AC=EC=85=8B=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 twe/install_db.php   | 2 +-
 twe/j_install_db.php | 4 +++-
 twe/js/install_db.js | 2 +-
 twe/sql/reset.sql    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/twe/install_db.php b/twe/install_db.php
index 3ed2c813..5fab35f3 100644
--- a/twe/install_db.php
+++ b/twe/install_db.php
@@ -43,7 +43,7 @@ if(Session::getUserGrade(true) == 5){
                     <div class="form-group row">
                         <label for="full_reset" class="col-sm-3 col-form-label">이전 DB 초기화</label>
                         <div class="col-sm-9" style="display: inline-flex;">
-                            <div class="btn-group btn-group-toggle" data-toggle="buttons">
+                            <div id="full_reset" class="btn-group btn-group-toggle" data-toggle="buttons">
                                 <label class="btn btn-secondary">
                                     <input type="radio" name="full_reset" value="1">Y
                                 </label>
diff --git a/twe/j_install_db.php b/twe/j_install_db.php
index 69256a6f..087436c0 100644
--- a/twe/j_install_db.php
+++ b/twe/j_install_db.php
@@ -31,7 +31,9 @@ if($fullReset && class_exists('\\sammo\\DB')){
 
     if($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/reset.sql'))){
         do{
-            $mysqli_obj->store_result();
+            if(!$mysqli_obj->store_result()){
+                break;
+            }
         } while($mysqli_obj->next_result());
     }
 }
diff --git a/twe/js/install_db.js b/twe/js/install_db.js
index bd62e222..638d3881 100644
--- a/twe/js/install_db.js
+++ b/twe/js/install_db.js
@@ -37,7 +37,7 @@ $(document).ready( function () {
             url:'j_install_db.php',
             dataType:'json',
             data:{
-                full_reset:$('#full_reset').val(),
+                full_reset:$('#full_reset input:radio:checked').val(),
                 db_host:$('#db_host').val(),
                 db_port:$('#db_port').val(),
                 db_id:$('#db_id').val(),
diff --git a/twe/sql/reset.sql b/twe/sql/reset.sql
index a9691592..2fe1499c 100644
--- a/twe/sql/reset.sql
+++ b/twe/sql/reset.sql
@@ -16,7 +16,7 @@ DROP TABLE IF EXISTS plock;
 # 게임 테이블 삭제
 DROP TABLE IF EXISTS game;
 
-# 외교 테이블 삭제
+# 메시지 테이블 삭제
 DROP TABLE IF EXISTS message;
 
 # 명전 테이블은 삭제하지 않음