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

Issue #2348547 by tim.plunkett, estoyausente: Fixed CommentViewBuilder should use static where possible, subclassing is currently too painful.

8.0.x
Alex Pott 2014-10-05 13:05:23 +02:00
parent 99876e6ac1
commit bc20bd54a6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/comment/src/CommentViewBuilder.php
View File

@ -132,7 +132,7 @@ class CommentViewBuilder extends EntityViewBuilder {
$display = $displays[$entity->bundle()];
if ($display->getComponent('links')) {
$callback = '\Drupal\comment\CommentViewBuilder::renderLinks';
$callback = get_class() . '::renderLinks';
$context = array(
'comment_entity_id' => $entity->id(),
'view_mode' => $view_mode,
@ -197,7 +197,7 @@ class CommentViewBuilder extends EntityViewBuilder {
* A renderable array representing the comment links.
*/
public static function renderLinks(array $element, array $context) {
$callback = '\Drupal\comment\CommentViewBuilder::renderLinks';
$callback = get_class() . '::renderLinks';
$placeholder = drupal_render_cache_generate_placeholder($callback, $context);
$links = array(
'#theme' => 'links__comment',
@ -209,8 +209,7 @@ class CommentViewBuilder extends EntityViewBuilder {
$entity = entity_load('comment', $context['comment_entity_id']);
$commented_entity = entity_load($context['commented_entity_type'], $context['commented_entity_id']);
$links['comment'] = self::buildLinks($entity, $commented_entity);
$links['comment'] = static::buildLinks($entity, $commented_entity);
// Allow other modules to alter the comment links.
$hook_context = array(
'view_mode' => $context['view_mode'],