Merge branch 'master' into refactor/minify-on-the-fly

This commit is contained in:
Kijin Sung 2016-01-09 21:22:01 +09:00
commit e61bc66373

View file

@ -1207,7 +1207,7 @@ class Context
return $obj->str;
}
function decodeIdna($domain)
public static function decodeIdna($domain)
{
if(strpos($domain, 'xn--') !== FALSE)
{
@ -1422,7 +1422,7 @@ class Context
* @param object $val Variable value
* @return mixed filtered value
*/
function _filterXmlVars($key, $val)
public function _filterXmlVars($key, $val)
{
if(is_array($val))
{