[Fusionforge-commits] r14520 - trunk/src/common/include
Thorsten Glaser
mirabilos at fusionforge.org
Fri Sep 30 17:27:15 CEST 2011
Author: mirabilos
Date: 2011-09-30 17:27:15 +0200 (Fri, 30 Sep 2011)
New Revision: 14520
Modified:
trunk/src/common/include/minijson.php
Log:
apparently we can pass null values without an ?\226?\128?\156unset?\226?\128?\157 warning
so converting the minijson_encode first argument to ByRef is unneccessary
?\226?\135?\146 simplify
Modified: trunk/src/common/include/minijson.php
===================================================================
--- trunk/src/common/include/minijson.php 2011-09-30 15:24:29 UTC (rev 14519)
+++ trunk/src/common/include/minijson.php 2011-09-30 15:27:15 UTC (rev 14520)
@@ -35,11 +35,11 @@
/**
* Encodes an array (indexed or associative) as JSON.
*
- * in: array-reference x (Value to be encoded)
+ * in: array x (Value to be encoded)
* in: string indent or bool false to skip beautification
* out: string encoded
*/
-function minijson_encode(&$x, $ri="") {
+function minijson_encode($x, $ri="") {
if (!isset($x) || is_null($x) || (is_float($x) &&
(is_nan($x) || is_infinite($x))))
return "null";
@@ -197,8 +197,7 @@
$rs .= ",\n";
if ($si !== false)
$rs .= $si;
- $c = (string)$v;
- $rs .= minijson_encode($c, false);
+ $rs .= minijson_encode((string)$v, false);
if ($ri === false)
$rs .= ":";
else
@@ -213,10 +212,8 @@
/* treat everything else as array or string */
if (!is_scalar($x))
- $c = (array)$x;
- else
- $c = (string)$x;
- return minijson_encode($c, $ri);
+ return minijson_encode((array)$x, $ri);
+ return minijson_encode((string)$x, $ri);
}
/**
More information about the Fusionforge-commits
mailing list