Commit dd14f70e authored by alexpott's avatar alexpott

Issue #2283049 by olli: Remove obsolete NodeController::page() method.

parent 69fd4ce1
......@@ -10,7 +10,6 @@
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Database\Connection;
use Drupal\Core\Datetime\Date;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\node\NodeTypeInterface;
......@@ -22,13 +21,6 @@
*/
class NodeController extends ControllerBase implements ContainerInjectionInterface {
/**
* The database connection.
*
* @var \Drupal\Core\Database\Connection
*/
protected $database;
/**
* The date service.
*
......@@ -39,21 +31,18 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
/**
* Constructs a NodeController object.
*
* @param \Drupal\Core\Database\Connection $database
* The database connection.
* @param \Drupal\Core\Datetime\Date $date
* The date service.
*/
public function __construct(Connection $database, Date $date) {
public function __construct(Date $date) {
$this->date = $date;
$this->database = $database;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static($container->get('database'), $container->get('date'));
return new static($container->get('date'));
}
......@@ -237,42 +226,6 @@ public function revisionOverview(NodeInterface $node) {
return $build;
}
/**
* Displays a node.
*
* @param \Drupal\node\NodeInterface $node
* The node we are displaying.
*
* @return array
* An array suitable for drupal_render().
*/
public function page(NodeInterface $node) {
$build = $this->buildPage($node);
foreach ($node->uriRelationships() as $rel) {
$uri = $node->urlInfo($rel);
// Set the node path as the canonical URL to prevent duplicate content.
$build['#attached']['drupal_add_html_head_link'][] = array(
array(
'rel' => $rel,
'href' => $node->url($rel),
)
, TRUE);
if ($rel == 'canonical') {
// Set the non-aliased canonical path as a default shortlink.
$build['#attached']['drupal_add_html_head_link'][] = array(
array(
'rel' => 'shortlink',
'href' => $node->url($rel, array('alias' => TRUE)),
)
, TRUE);
}
}
return $build;
}
/**
* The _title_callback for the node.add route.
*
......
......@@ -29,10 +29,11 @@ public function view(EntityInterface $node, $view_mode = 'full', $langcode = NUL
// Set the node path as the canonical URL to prevent duplicate content.
$build['#attached']['drupal_add_html_head_link'][] = array(
array(
'rel' => $rel,
'href' => $node->url($rel),
)
, TRUE);
'rel' => $rel,
'href' => $node->url($rel),
),
TRUE,
);
if ($rel == 'canonical') {
// Set the non-aliased canonical path as a default shortlink.
......@@ -40,8 +41,9 @@ public function view(EntityInterface $node, $view_mode = 'full', $langcode = NUL
array(
'rel' => 'shortlink',
'href' => $node->url($rel, array('alias' => TRUE)),
)
, TRUE);
),
TRUE,
);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment