diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index 6e1e4bcfb..4a151417d 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -131,8 +131,8 @@
/**
* @brief 커밋
**/
- function commit() {
- if(!$this->isConnected() || !$this->transaction_started) return;
+ function commit($force = false) {
+ if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
$this->_query("commit");
$this->transaction_started = false;
}
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index 65f91f3c6..2b5096561 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -105,7 +105,8 @@
/**
* @brief 커밋
**/
- function commit() {
+ function commit($force = false) {
+ if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
if(!$this->is_connected || !$this->transaction_started) return;
$this->_query("COMMIT;");
$this->transaction_started = false;
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index a05809a16..268442b5e 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -113,8 +113,8 @@
/**
* @brief 커밋
**/
- function commit() {
- if(!$this->isConnected() || !$this->transaction_started) return;
+ function commit($force = false) {
+ if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
$this->handler->commit();
$this->transaction_started = false;
}
diff --git a/config/config.inc.php b/config/config.inc.php
index 97b6b78d0..acdf94a60 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -24,7 +24,7 @@
* 2 : 1 + DB 쿼리
* 3 : 모든 로그
**/
- define('__DEBUG__', 3);
+ define('__DEBUG__', 0);
/**
* @brief 간단하게 사용하기 위한 함수 정의한 파일 require
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index fd9415fbd..b4b1ba1f6 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -98,7 +98,7 @@
if(!$output->toBool()) {
$args->password = md5(getmicrotime());
$output = $this->insertMember($args);
- $this->doLogin($args->user_id);
+ $output = $this->doLogin($args->user_id);
}
// 페이지 이동
@@ -896,7 +896,7 @@
}
}
- $oDB->commit();
+ $oDB->commit(true);
$output->add('member_srl', $args->member_srl);
return $output;
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index cf6f7e35f..fac64e7b9 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -10,7 +10,6 @@
/**
* @brief 자주 호출될거라 예상되는 데이터는 내부적으로 가지고 있자...
**/
- var $member_info = NULL;
var $member_groups = NULL;
var $join_form_list = NULL;
@@ -104,17 +103,14 @@
**/
function getMemberInfoByUserID($user_id) {
if(!$user_id) return;
- if(!$this->member_info[$user_id]) {
- $args->user_id = $user_id;
- $output = executeQuery('member.getMemberInfo', $args);
- if(!$output) return $output;
- $member_info = $this->arrangeMemberInfo($output->data);
- $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+ $args->user_id = $user_id;
+ $output = executeQuery('member.getMemberInfo', $args);
+ if(!$output) return $output;
- $this->member_info[$user_id] = $member_info;
- }
- return $this->member_info[$user_id];
+ $member_info = $this->arrangeMemberInfo($output->data);
+ $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+ return $member_info;
}
/**
@@ -122,17 +118,13 @@
**/
function getMemberInfoByMemberSrl($member_srl) {
if(!$member_srl) return;
- if(!$this->member_info[$member_srl]) {
- $args->member_srl = $member_srl;
- $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
- if(!$output) return $output;
+ $args->member_srl = $member_srl;
+ $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
+ if(!$output) return $output;
- $member_info = $this->arrangeMemberInfo($output->data);
- $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
-
- $this->member_info[$member_srl] = $member_info;
- }
- return $this->member_info[$member_srl];
+ $member_info = $this->arrangeMemberInfo($output->data);
+ $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+ return $member_info;
}
/**
diff --git a/modules/member/queries/getMemberInfo.xml b/modules/member/queries/getMemberInfo.xml
index 017880377..2ace08801 100644
--- a/modules/member/queries/getMemberInfo.xml
+++ b/modules/member/queries/getMemberInfo.xml
@@ -6,6 +6,6 @@