From ed65b431700dc6cf4ed36a6eb81e9e314076327d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=9E=8C=EC=B8=A0?= <82g74nx0bm69@naver.com> Date: Wed, 2 Sep 2015 08:44:17 +0900 Subject: [PATCH 1/5] getDbInfo -> getDBInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 오타 수정. (php언어 특성상 오류는 안나지만..) --- modules/install/install.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 178c5a56a..cfaa2f564 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -600,7 +600,7 @@ class installController extends install { $db_tmp_config_file = $this->db_tmp_config_file; - $db_info = Context::getDbInfo(); + $db_info = Context::getDBInfo(); if(!$db_info) return; $buff = $this->_getDBConfigFileContents($db_info); From 91f23b4fa0e9156f4b8f8858b03588cb46863ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=9E=8C=EC=B8=A0?= <82g74nx0bm69@naver.com> Date: Wed, 2 Sep 2015 09:11:04 +0900 Subject: [PATCH 2/5] Update install.controller.php --- modules/install/install.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index cfaa2f564..6fb6d6861 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -641,7 +641,7 @@ class installController extends install $config_file = Context::getConfigFile(); //if(file_exists($config_file)) return; - $db_info = Context::getDbInfo(); + $db_info = Context::getDBInfo(); if(!$db_info) return; $buff = $this->_getDBConfigFileContents($db_info); From f12caee82d3fc0b6a9ff73ad1e2745dc1b2a4c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=9E=8C=EC=B8=A0?= <82g74nx0bm69@naver.com> Date: Wed, 2 Sep 2015 09:12:36 +0900 Subject: [PATCH 3/5] Update admin.admin.controller.php --- modules/admin/admin.admin.controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index f17618391..ed257aad4 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -501,7 +501,7 @@ class adminAdminController extends admin $vars = Context::getRequestVars(); $oInstallController = getController('install'); - $db_info = Context::getDbInfo(); + $db_info = Context::getDBInfo(); $db_info->use_sitelock = ($vars->use_sitelock) ? $vars->use_sitelock : 'N'; $db_info->sitelock_title = $vars->sitelock_title; @@ -543,7 +543,7 @@ class adminAdminController extends admin { $vars = Context::getRequestVars(); - $db_info = Context::getDbInfo(); + $db_info = Context::getDBInfo(); $white_object = $vars->embed_white_object; $white_object = preg_replace("/[\r\n|\r|\n]+/", '|@|', $white_object); From 20230b12847a7493f2cb7b685ce21cf03e06fafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=9E=8C=EC=B8=A0?= <82g74nx0bm69@naver.com> Date: Thu, 24 Sep 2015 14:29:28 +0900 Subject: [PATCH 4/5] =?UTF-8?q?autoload=20=EC=A0=81=EC=9A=A9=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=ED=95=84=EC=9A=94=EC=97=86=EC=96=B4=EC=A7=84=20?= =?UTF-8?q?=EC=83=81=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #1374 참고한 추가적인 수정사항 소스검색 결과 이 상수가 사용되는 지점은 이곳밖에 없음. --- classes/db/DB.class.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index 02dcd1be4..317ee19e1 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -1,11 +1,6 @@ */ -if(!defined('__XE_LOADED_DB_CLASS__')) -{ - define('__XE_LOADED_DB_CLASS__', 1); -} - /** * - DB parent class * - usage of db in XE is via xml From 6adfc7764ba05da95fd74b075b8c90dc227cbb0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=9E=8C=EC=B8=A0?= <82g74nx0bm69@naver.com> Date: Thu, 24 Sep 2015 14:46:44 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix=20#1690=20$GLOBALS['HTTP=5FRAW=5FPOST?= =?UTF-8?q?=5FDATA']=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #1684 -bug fix-> #1690 -bug fix-> 이것.. --- classes/context/Context.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 94f762dbe..b2094b9d6 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -202,6 +202,7 @@ class Context { if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === true) { if(simplexml_load_string(file_get_contents("php://input")) !== false) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input"); + if(strpos($_SERVER['CONTENT_TYPE'], 'json') || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json')) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input"); } // set context variables in $GLOBALS (to use in display handler)