fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix domain handling in getUrl()

Browse source
This commit is contained in:
Kijin Sung 2017-02-22 16:45:25 +09:00
parent 37a0aa0f13
commit e5126c7f98
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/context/Context.class.php
View file

@ -1547,11 +1547,15 @@ class Context
}
// If $domain is set, handle it (if $domain is vid type, remove $domain and handle with $vid)
if (strpos($domain, '/') !== false)
if ($domain && strpos($domain, '/') !== false)
{
$domain = Rhymix\Framework\URL::getDomainFromURL($domain);
}
if($domain && isSiteID($domain))
if ($domain && strpos($domain, 'xn--') !== false)
{
$domain = Rhymix\Framework\URL::decodeIdna($domain);
}
if ($domain && isSiteID($domain))
{
$vid = $domain;
$domain = '';