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

Issue #2148709 by amateescu, xjm: CommentManager::getFields() should not try to get fields for config entity types.

8.0.x
webchick 2013-12-03 11:22:17 -08:00
parent a38172dc20
commit e900586b98
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/comment/lib/Drupal/comment/CommentManager.php
View File

@ -56,12 +56,14 @@ class CommentManager implements CommentManagerInterface {
/**
* {@inheritdoc}
*/
public function getFields($entity_type = NULL) {
$map = $this->getAllFields();
if (!isset($map[$entity_type])) {
public function getFields($entity_type) {
$info = $this->entityManager->getDefinition($entity_type);
if (!is_subclass_of($info['class'], '\Drupal\Core\Entity\ContentEntityInterface')) {
return array();
}
return $map[$entity_type];
$map = $this->getAllFields();
return isset($map[$entity_type]) ? $map[$entity_type] : array();
}
/**

4
core/modules/comment/lib/Drupal/comment/CommentManagerInterface.php
View File

@ -27,7 +27,7 @@ interface CommentManagerInterface {
* Utility function to return an array of comment fields.
*
* @param string $entity_type
* The entity type to return fields which are attached on.
* The content entity type to which the comment fields are attached.
*
* @return array
* An array of comment field map definitions, keyed by field name. Each
@ -38,7 +38,7 @@ interface CommentManagerInterface {
*
* @see field_info_field_map()
*/
public function getFields($entity_type = NULL);
public function getFields($entity_type);
/**
* Utility function to return all comment fields.