From e2c30c933bae065797947e885dabba494cc4bafc Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Thu, 13 Sep 2012 01:51:16 -0500
Subject: [PATCH] Adjust ViewSubscriber's subrequest handling again for render
API.
---
core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php
index 935908307889..d96e5aeada40 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php
@@ -63,8 +63,13 @@ public function onView(GetResponseForControllerResultEvent $event) {
}
}
else {
- $page_callback_result = $event->getControllerResult();
- $event->setResponse(new Response(drupal_render($page_callback_result)));
+ $page_result = $event->getControllerResult();
+ if (!is_array($page_result)) {
+ $page_result = array(
+ '#markup' => $page_result,
+ );
+ }
+ $event->setResponse(new Response(drupal_render($page_result)));
}
}
--
GitLab