From 9e6005ccbc244469caee1358571359112180d0f7 Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Wed, 25 Dec 2019 23:01:37 +0900
Subject: [PATCH] =?UTF-8?q?form=20rx=5Fajax=20=EC=82=AC=EC=9A=A9=EC=8B=9C?=
 =?UTF-8?q?=20XE=5FVALIDATOR=5FMESSAGE=20=EC=84=B8=EC=85=98=EC=9D=84=20?=
 =?UTF-8?q?=EC=9D=B4=EC=9A=A9=ED=95=9C=20=EB=A9=94=EC=84=B8=EC=A7=80=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=EA=B0=80=20=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8A=94=20=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

---
 classes/context/Context.class.php      | 1 +
 classes/module/ModuleHandler.class.php | 2 +-
 common/js/xml_handler.js               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index abbe9c726..92a5b282e 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -165,6 +165,7 @@ class Context
 	 */
 	private static $_reserved_keys = array(
 		'_rx_ajax_compat' => true,
+		'_rx_ajax_form' => true,
 		'_rx_csrf_token' => true,
 		'_rx_target_iframe' => true,
 	);
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 27de1368f..32cdbfad3 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -807,7 +807,7 @@ class ModuleHandler extends Handler
 		$procResult = $oModule->proc();
 
 		$methodList = array('XMLRPC' => 1, 'JSON' => 1, 'JS_CALLBACK' => 1);
-		if(!$oModule->stop_proc && !isset($methodList[Context::getRequestMethod()]))
+		if(!$oModule->stop_proc && (!isset($methodList[Context::getRequestMethod()]) || isset($_POST['_rx_ajax_form'])))
 		{
 			$error = $oModule->getError();
 			$message = $oModule->getMessage();
diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js
index eb6d531bd..47ff8bc2b 100644
--- a/common/js/xml_handler.js
+++ b/common/js/xml_handler.js
@@ -402,7 +402,7 @@
 			}, 1000);
 			form.submit();
 		} else {
-			window.exec_json('raw', form.serialize(), callback_success, callback_error);
+			window.exec_json('raw', form.serialize() + '&_rx_ajax_form=1', callback_success, callback_error);
 		}
 	});