From a468b492e2236c3e174375ac264069009609c6f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Rene=CC=81e=20Beach?= <splendidnoise@gmail.com>
Date: Fri, 15 Nov 2013 13:22:14 -0500
Subject: [PATCH] don't send bad data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
---
 .../contextual/lib/Drupal/contextual/ContextualController.php      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php b/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
index aca277d..6b237f6 100644
--- a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
+++ b/core/modules/contextual/lib/Drupal/contextual/ContextualController.php
@@ -41,10 +41,13 @@ public function render(Request $request) {
         '#type' => 'contextual_links',
         '#contextual_links' => _contextual_id_to_links($id),
       );
-      $rendered[$id] = drupal_render($element);
+      $output = drupal_render($element);
+      if (!empty($output)) {
+        $rendered[$id] = $output;
+      }
     }
 
-    return new JsonResponse($rendered);
+    return new JsonResponse((object) $rendered);
   }
 
 }
-- 
1.8.2