mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-22 05:15:29 +09:00
issue2802 modified callback parameter. Classname\:\:function doesn`t support lower version than php5.2.3
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12571 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
714caf13e0
commit
ccfaedc2f8
1 changed files with 4 additions and 4 deletions
|
|
@ -741,12 +741,12 @@ class Context {
|
||||||
|
|
||||||
foreach($charset_list as $charset)
|
foreach($charset_list as $charset)
|
||||||
{
|
{
|
||||||
array_walk($obj,'Context::checkConvertFlag',$charset);
|
array_walk($obj,array('Context','checkConvertFlag'),$charset);
|
||||||
$flag = Context::checkConvertFlag($flag = true);
|
$flag = Context::checkConvertFlag($flag = true);
|
||||||
if($flag)
|
if($flag)
|
||||||
{
|
{
|
||||||
if($charset == 'UTF-8') return $obj;
|
if($charset == 'UTF-8') return $obj;
|
||||||
array_walk($obj,'Context::doConvertEncoding',$charset);
|
array_walk($obj,array('Context','doConvertEncoding'),$charset);
|
||||||
return $obj;
|
return $obj;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -767,7 +767,7 @@ class Context {
|
||||||
if($charset)
|
if($charset)
|
||||||
{
|
{
|
||||||
if(is_array($val))
|
if(is_array($val))
|
||||||
array_walk($val,'Context::checkConvertFlag',$charset);
|
array_walk($val,array('Context','checkConvertFlag'),$charset);
|
||||||
else if($val && iconv($charset,$charset,$val)!=$val) $flag = false;
|
else if($val && iconv($charset,$charset,$val)!=$val) $flag = false;
|
||||||
else $flag = false;
|
else $flag = false;
|
||||||
}
|
}
|
||||||
|
|
@ -792,7 +792,7 @@ class Context {
|
||||||
{
|
{
|
||||||
if (is_array($val))
|
if (is_array($val))
|
||||||
{
|
{
|
||||||
array_walk($val,'Context::doConvertEncoding',$charset);
|
array_walk($val,array('Context','doConvertEncoding'),$charset);
|
||||||
}
|
}
|
||||||
else $val = iconv($charset,'UTF-8',$val);
|
else $val = iconv($charset,'UTF-8',$val);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue