From 8c5f96f8c5c337d7d544406046deb3fcf10dab07 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 15 Dec 2024 00:16:57 +0900
Subject: [PATCH] Fix incorrect Content-Type in JSON callback responses #2448

---
 classes/display/DisplayHandler.class.php |  2 +-
 modules/menu/tpl/sitemap.html            | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 341badb43..d9ed8241c 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -97,7 +97,7 @@ class DisplayHandler extends Handler
 		}
 		else
 		{
-			if($responseMethod == 'JSON' || $responseMethod == 'JS_CALLBACK' || isset($_SERVER['HTTP_X_AJAX_COMPAT']) || isset($_POST['_rx_ajax_compat']))
+			if($responseMethod == 'JSON' || isset($_SERVER['HTTP_X_AJAX_COMPAT']) || isset($_POST['_rx_ajax_compat']))
 			{
 				self::_printJSONHeader();
 			}
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 126795823..051feab82 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -350,7 +350,9 @@
 			<h1>{$lang->menu_img_btn}</h1>
 			<div class="cnt">
 				<p style="border-bottom:1px solid #ddd;width:220px;min-width:100%;padding-bottom:10px">{$lang->about_imgbtn}</p>
-				<form action="?module=menu&act=procMenuAdminButtonUpload" class="_btn_normal" target="submitTarget" method="post" enctype="multipart/form-data">
+				<form action="{\RX_BASEURL}" class="_btn_normal" target="submitTarget" method="post" enctype="multipart/form-data">
+					<input name="module" type="hidden" value="menu" />
+					<input name="act" type="hidden" value="procMenuAdminButtonUpload" />
 					<input name="menu_item_srl" type="hidden" value=""/>
 					<input name="xe_js_callback" type="hidden" value="top.onBtnImgUploaded"/>
 					<input name="isNormalDelete" type="hidden" value="Y"/>
@@ -368,7 +370,9 @@
 						</span>
 					</div>
 				</form>
-				<form action="?module=menu&act=procMenuAdminButtonUpload" class="_btn_hover" target="submitTarget" method="post" enctype="multipart/form-data">
+				<form action="{\RX_BASEURL}" class="_btn_hover" target="submitTarget" method="post" enctype="multipart/form-data">
+					<input name="module" type="hidden" value="menu" />
+					<input name="act" type="hidden" value="procMenuAdminButtonUpload" />
 					<input name="menu_item_srl" type="hidden" value=""/>
 					<input name="xe_js_callback" type="hidden" value="top.onBtnImgUploaded"/>
 					<input name="isHoverDelete" type="hidden" value="Y"/>
@@ -386,7 +390,9 @@
 						</span>
 					</div>
 				</form>
-				<form action="?module=menu&act=procMenuAdminButtonUpload" class="_btn_selected" target="submitTarget" method="post" enctype="multipart/form-data">
+				<form action="{\RX_BASEURL}" class="_btn_selected" target="submitTarget" method="post" enctype="multipart/form-data">
+					<input name="module" type="hidden" value="menu" />
+					<input name="act" type="hidden" value="procMenuAdminButtonUpload" />
 					<input name="menu_item_srl" type="hidden" value=""/>
 					<input name="xe_js_callback" type="hidden" value="top.onBtnImgUploaded"/>
 					<input name="isActiveDelete" type="hidden" value="Y"/>