fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Decode IDNA when importing default URL

Browse source
This commit is contained in:
Kijin Sung 2016-02-05 14:50:47 +09:00
parent e28856bfbb
commit 9895699591
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/framework/config.php
View file

@ -279,7 +279,12 @@ class Config
$config['locale']['internal_timezone'] = intval(date('Z'));
// Convert URL configuration.
$config['url']['default'] = $db_info->default_url ?: \RX_BASEURL;
$default_url = $db_info->default_url;
if (strpos($default_url, 'xn--') !== false)
{
$default_url = \Context::decodeIdna($default_url);
}
$config['url']['default'] = $default_url ?: \RX_BASEURL;
$config['url']['http_port'] = $db_info->http_port ?: null;
$config['url']['https_port'] = $db_info->https_port ?: null;
$config['url']['ssl'] = $db_info->use_ssl ?: 'none';