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

Merge branch 'develop' into fix/context-static-this

Browse source 
Conflicts:
	classes/context/Context.class.php
This commit is contained in:
Kijin Sung 2016-01-09 15:53:46 +09:00
commit 59c378ee17
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1197,7 +1197,7 @@ class Context
return $obj->str;
}
function decodeIdna($domain)
public static function decodeIdna($domain)
{
if(strpos($domain, 'xn--') !== FALSE)
{