Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust ViewSubscriber's subrequest handling again for render API.

8.0.x
Larry Garfield 2012-09-13 01:51:16 -05:00 committed by effulgentsia
parent 67fdbebdaf
commit e2c30c933b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php
View File

@ -63,8 +63,13 @@ class ViewSubscriber implements EventSubscriberInterface {
}
}
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)));
}
}