From 6d37e281f68553b712ed40d42fcee26fd3120715 Mon Sep 17 00:00:00 2001
From: The JMS Bot <jmsbot.github@gmail.com>
Date: Fri, 31 Aug 2012 03:31:21 -0700
Subject: [PATCH] Applying head state of symfony/symfony (PR 5401)

---
 src/Symfony/Component/Serializer/Encoder/XmlEncoder.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 9fd3f97..91e4b80 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -240,7 +240,11 @@ private function parseXml($node)
 
             if ($key === 'item') {
                 if (isset($value['@key'])) {
-                    $data[(string) $value['@key']] = $value['#'];
+                    if (isset($value['#'])) {
+                        $data[(string) $value['@key']] = $value['#'];
+                    } else {
+                        $data[(string) $value['@key']] = $value;
+                    }
                 } else {
                     $data['item'][] = $value;
                 }
@@ -391,4 +395,3 @@ private function selectNodeType($node, $val)
         return true;
     }
 }
-