mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-07 10:41:40 +09:00
Fix JSON encoding to be fully XE-compatible
This commit is contained in:
parent
93ca2acdc8
commit
379bed000d
2 changed files with 28 additions and 15 deletions
|
|
@ -15,20 +15,37 @@ class JSONDisplayHandler
|
|||
$variables['error'] = $oModule->getError();
|
||||
$variables['message'] = $oModule->getMessage();
|
||||
|
||||
$temp = array();
|
||||
foreach ($variables as $key => $value)
|
||||
self::_convertCompat($variables, Context::getRequestMethod());
|
||||
return json_encode($variables);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert arrays in a format that is compatible with XE.
|
||||
*
|
||||
* @param array $array
|
||||
* @param string $compat_type
|
||||
* @return array
|
||||
*/
|
||||
protected static function _convertCompat(&$array, $compat_type = 'JSON')
|
||||
{
|
||||
foreach ($array as $key => &$value)
|
||||
{
|
||||
if (self::_isNumericArray($value))
|
||||
if (is_array($value))
|
||||
{
|
||||
$temp[$key] = array_values($value);
|
||||
}
|
||||
else
|
||||
{
|
||||
$temp[$key] = $value;
|
||||
self::_convertCompat($value, $compat_type);
|
||||
if (self::_isNumericArray($value))
|
||||
{
|
||||
if ($compat_type === 'XMLRPC')
|
||||
{
|
||||
$value = array('item' => array_values($value));
|
||||
}
|
||||
else
|
||||
{
|
||||
$value = array_values($value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return json_encode($temp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue