geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correction of a BC break with json_encode and PHP 5.2.x

Browse Source
This commit is contained in:
JEDIBC
2011-07-27 12:24:34 +02:00
parent d67832ea5d
commit 755ea99bd4
1 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Extension/Core.php
+37 -15
View File
@@ -251,23 +251,45 @@ function twig_urlencode_filter($url, $raw = false)
return urlencode($url); return urlencode($url);
} }
/** if (version_compare(PHP_VERSION, '5.3.0', '<'))
* JSON encodes a PHP variable.
*
* @param mixed $value The value to encode.
* @param integer $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
*
* @return mixed The JSON encoded value
*/
function twig_jsonencode_filter($value, $options = 0)
{ {
if ($value instanceof Twig_Markup) { /**
$value = (string) $value; * JSON encodes a PHP variable.
} elseif (is_array($value)) { *
array_walk_recursive($value, '_twig_markup2string'); * @param mixed $value The value to encode.
} * @param integer $options Not used on PHP 5.2.x
*
* @return mixed The JSON encoded value
*/
function twig_jsonencode_filter($value, $options = 0)
{
if ($value instanceof Twig_Markup) {
$value = (string) $value;
} elseif (is_array($value)) {
array_walk_recursive($value, '_twig_markup2string');
}
return json_encode($value, $options); return json_encode($value);
}
} else {
/**
* JSON encodes a PHP variable.
*
* @param mixed $value The value to encode.
* @param integer $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
*
* @return mixed The JSON encoded value
*/
function twig_jsonencode_filter($value, $options = 0)
{
if ($value instanceof Twig_Markup) {
$value = (string) $value;
} elseif (is_array($value)) {
array_walk_recursive($value, '_twig_markup2string');
}
return json_encode($value, $options);
}
} }
function _twig_markup2string(&$value) function _twig_markup2string(&$value)