Merge branch 'master' into develop

This commit is contained in:
Min-Soo Kim 2018-07-24 23:47:55 +09:00
commit 6f981318ca

View file

@ -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 = "{Context::encodeIdna(Context::getDefaultUrl())}";
var current_url = "{Context::encodeIdna($current_url)}";
var request_uri = "{Context::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'};