From 59a4addf65f802b6304e824d12de0cd4342cf9d2 Mon Sep 17 00:00:00 2001
From: Aron Novak <aron.novak@agenceinovae.com>
Date: Wed, 17 Jun 2015 11:16:01 -0400
Subject: [PATCH] CRM_Utils_REST: better datastructure support, constant list
 for instance, CRM-16709

---
 CRM/Utils/REST.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CRM/Utils/REST.php b/CRM/Utils/REST.php
index e1424833fd..ec0468f07c 100644
--- a/CRM/Utils/REST.php
+++ b/CRM/Utils/REST.php
@@ -165,8 +165,13 @@ class CRM_Utils_REST {
     // check if this is a single element result (contact_get etc)
     // or multi element
     if ($hier) {
-      foreach ($result['values'] as $n => $v) {
-        $xml .= "<Result>\n" . CRM_Utils_Array::xml($v) . "</Result>\n";
+      foreach ($result['values'] as $k => $v) {
+        if (is_array($v)) {
+          $xml .= "<Result>\n" . CRM_Utils_Array::xml($v) . "</Result>\n";
+        }
+        elseif (!is_object($v)) {
+          $xml .= "<Result>\n<id>{$k}</id><value>{$v}</value></Result>\n";
+        }
       }
     }
     else {
-- 
2.25.1