From b1d64e358d2e4070668c4af158c9573daf33bda5 Mon Sep 17 00:00:00 2001
From: Lea Haensenberger <lea.haensenberger@gmail.com>
Date: Mon, 5 May 2014 12:01:05 +0200
Subject: [PATCH] Also cleanup fields in properties of objects

---
 DependencyInjection/FOSElasticaExtension.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index 2019d5e..ede7c21 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -574,11 +574,16 @@ class FOSElasticaExtension extends Extension
 
     protected function cleanUpMapping(&$mappings)
     {
-        foreach ($mappings as &$fieldProperties)
-        if (empty($fieldProperties['fields'])) {
-            unset($fieldProperties['fields']);
-        } else {
-            $this->cleanUpMapping($fieldProperties['fields']);
+        foreach ($mappings as &$fieldProperties) {
+            if (empty($fieldProperties['fields'])) {
+                unset($fieldProperties['fields']);
+            } else {
+                $this->cleanUpMapping($fieldProperties['fields']);
+            }
+
+            if (!empty($fieldProperties['properties'])) {
+                $this->cleanUpMapping($fieldProperties['properties']);
+            }
         }
     }
 }