Bed !

diff --git a/lib/php/out.php b/lib/php/out.php
index 987a61a4b694af3ec35e4c1ce682035af25f3d03..83989195f47adc2220a913fd42b6c2a6017cba8b 100644 (file)
--- a/lib/php/out.php
+++ b/lib/php/out.php
@@ -34,7 +34,7 @@ class Out extends Nb {
         'head' => 'out_tag_head',
       ),
       'xml' => array(
-        'enclose' => array("<rows>".OUT_EOL,"</rows>"),
+        'enclose' => array('<?xml version="1.0" encoding="utf-8"?>'.OUT_EOL."<rows>".OUT_EOL,"</rows>"),
         'function' => 'out_xml',
       ),
       'yaml' => array(
@@ -156,6 +156,7 @@ function out_csv_head(&$row,$o) {
 function out_tag_head(&$data,$o) {
   #return var_dump($row,true); return '';
   $o['tag'] = isset($o['tag_head']) ? $o['tag_head'] : $o['tag'];
+  #echo out_tag($row,$o); return true;
   $row = out::ar_first($data);
   if (!out::is_hash($row)) $row = $data;
   #if (!is_array($row)) return out_csv(array_fill(0,count($row),'?'));
@@ -163,6 +164,7 @@ function out_tag_head(&$data,$o) {
   if (out::is_hash($row)) $row = array_keys($row);
   echo out_tag($row,$o);
 }
+
 function out_tag(&$row,$o) {
 #var_dump($row); return '';
   if (!is_array($row)) return var_export($row,true);
@@ -183,7 +185,7 @@ function out_tag(&$row,$o) {
 function out_xml(&$row,$o) {
   echo (OUT_EOL ? '  ' : '')."<row>".OUT_EOL;
   foreach ($row as $k => $v) {
-    echo (OUT_EOL ? '    ' : '')."<$k>![CDATA[$v]]></$k>".OUT_EOL;
+    echo (OUT_EOL ? '    ' : '')."<$k><![CDATA[$v]]></$k>".OUT_EOL;
   }
   echo (OUT_EOL ? '  ' : '')."</row>".OUT_EOL;
 }