From 83fe72be18771f426aeb3115d997b2a44c23269d Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 30 May 2018 21:26:05 +0900
Subject: [PATCH] Fix #1037 IDN in Javascript @misol

---
 common/framework/url.php      | 2 +-
 common/tpl/common_layout.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/framework/url.php b/common/framework/url.php
index 05775cee5..3ef79f7e7 100644
--- a/common/framework/url.php
+++ b/common/framework/url.php
@@ -38,7 +38,7 @@ class URL
 	public static function getCurrentDomainURL($path = '/')
 	{
 		$proto = \RX_SSL ? 'https://' : 'http://';
-		$host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
+		$host = isset($_SERVER['HTTP_HOST']) ? self::decodeIdna($_SERVER['HTTP_HOST']) : 'localhost';
 		return $proto . $host . '/' . ltrim($path, '/');
 	}
 	
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 15a38c76f..a047c8958 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -48,9 +48,9 @@
 
 <!-- COMMON JS VARIABLES -->
 <script>
-	var default_url = "{Context::getDefaultUrl()}";
-	var current_url = "{$current_url}";
-	var request_uri = "{$request_uri}";
+	var default_url = "{\Rhymix\Framework\URL::encodeIdna(Context::getDefaultUrl())}";
+	var current_url = "{\Rhymix\Framework\URL::encodeIdna($current_url)}";
+	var request_uri = "{\Rhymix\Framework\URL::encodeIdna($request_uri)}";
 	var current_lang = xe.current_lang = "{$lang_type}";
 	var current_mid = {json_encode($mid ?: null)};
 	var http_port = {Context::get("_http_port") ?: 'null'};