From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Sat, 20 May 2006 20:40:10 +0000 (+0000)
Subject: fix text output of Diogenes_Tree_Node
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=35574d7c0119faee5711d8bb14acd51199ecca77;p=diogenes.git

fix text output of Diogenes_Tree_Node
---

diff --git a/include/Tree/Node.php b/include/Tree/Node.php
index 04668ba..c29c70e 100644
--- a/include/Tree/Node.php
+++ b/include/Tree/Node.php
@@ -49,17 +49,16 @@ function var_encode_text($var, $level = 0, $no_children = FALSE, $tabstr = '  ',
     return $code;
   } elseif (is_array($var)) {
     $arraysep = ",$eol";
-    $code = "array(".$eol;
+    $vcode = '';
     foreach ($var as $key => $value) {
-      $code .= str_repeat($tabstr, $level + 1);
-      $code .= "'$key'=>".var_encode_text($value, $level + 1, $no_children, $tabstr, $eol);
-      $code .= $arraysep;
+      $vcode .= str_repeat($tabstr, $level + 1);
+      $vcode .= "'$key'=>".var_encode_text($value, $level + 1, $no_children, $tabstr, $eol);
+      $vcode .= $arraysep;
     }
-    if (substr($code, -strlen($arraysep)))
-      $code = substr($code, 0, - strlen($arraysep));
-    $code .= $eol;
-    //$code = chop($code, ','); //remove unnecessary coma
-    $code .= str_repeat($tabstr, $level) . ")";
+    if (substr($vcode, -strlen($arraysep)) == $arraysep)
+      $vcode = substr($vcode, 0, - strlen($arraysep));
+
+    $code = "array(".($vcode ? "$eol$vcode$eol".str_repeat($tabstr, $level)  : ""). ")";
     return $code;
   } elseif (is_scalar($var)) {
     return "'".$var."'";