diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php index 33c5989..6ee2017 100644 --- a/core/modules/node/src/Controller/NodeController.php +++ b/core/modules/node/src/Controller/NodeController.php @@ -12,6 +12,7 @@ use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Datetime\DateFormatter; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Render\RendererInterface; use Drupal\Core\Url; use Drupal\node\NodeTypeInterface; use Drupal\node\NodeInterface; @@ -30,20 +31,33 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa protected $dateFormatter; /** + * The renderer service. + * + * @var \Drupal\Core\Render\RendererInterface + */ + protected $renderer; + + /** * Constructs a NodeController object. * * @param \Drupal\Core\Datetime\DateFormatter $date_formatter * The date formatter service. + * @param \Drupal\Core\Render\RendererInterface $renderer + * The renderer service. */ - public function __construct(DateFormatter $date_formatter) { + public function __construct(DateFormatter $date_formatter, RendererInterface $renderer) { $this->dateFormatter = $date_formatter; + $this->renderer = $renderer; } /** * {@inheritdoc} */ public static function create(ContainerInterface $container) { - return new static($container->get('date.formatter')); + return new static( + $container->get('date.formatter'), + $container->get('renderer') + ); } @@ -112,7 +126,7 @@ public function add(NodeTypeInterface $node_type) { */ public function revisionShow($node_revision) { $node = $this->entityManager()->getStorage('node')->loadRevision($node_revision); - $node_view_controller = new NodeViewController($this->entityManager); + $node_view_controller = new NodeViewController($this->entityManager, $this->renderer); $page = $node_view_controller->view($node); unset($page['nodes'][$node->id()]['#cache']); return $page; diff --git a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php index 3389858..4f6d33d 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Controller/EntityViewControllerTest.php @@ -67,7 +67,7 @@ public function testView() { // Initialize the controller to test. - $controller = new EntityViewController($entity_manager); + $controller = new EntityViewController($entity_manager, $this->getMock('Drupal\Core\Render\RendererInterface')); // Test the view method. $this->assertEquals($controller->view($entity, 'full'), 'Output from rendering the entity');