Skip to content
This repository was archived by the owner on Jan 5, 2018. It is now read-only.

Check whether the specified entity_type exists before trying to embed entity. #10

Closed
cs-shadow wants to merge 4 commits into from
Closed

Check whether the specified entity_type exists before trying to embed entity. #10

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a486f2
Remove all children of the node from the existing DOMDocument.
cs-shadow May 17, 2014
0120856
Continue only if specified entity type exists.
cs-shadow May 17, 2014
aafccf4
Unnecessary boolean comaprison skipped.
cs-shadow May 20, 2014
b245de1
Merge branch 'staging' of https://github.com/cs-shadow/entity_embed i…
cs-shadow May 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/Drupal/entity_embed/Plugin/Filter/EntityEmbedFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ public function process($text, $langcode, $cache, $cache_id) {
$entity = NULL;
$view_mode = $node->getAttribute('data-view-mode');

// Continue only if specified entity type exists.
$entity_info = \Drupal::entityManager()->getDefinition($entity_type);
if($entity_info == NULL) {
watchdog($entity_type, "Specified entity type '%entity_type' does not exists.", array('%entity_type' => $entity_type));
Copy link
Copy Markdown
Member

@slashrsm slashrsm May 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use "entity_embed" instead of $entity_type. This will clearly show that this error happened here.

return $text;
}

// Load the entity either by UUID (preferred) or ID.
if ($node->hasAttribute('data-entity-uuid')) {
$uuid = $node->getAttribute('data-entity-uuid');
Expand Down Expand Up @@ -82,6 +89,10 @@ public function process($text, $langcode, $cache, $cache_id) {
// one, importing also the child nodes of the updated node.
$updated_node = $dom->importNode($updated_node, TRUE);

// Remove all children of the node from the existing DOMDocument.
Copy link
Copy Markdown
Member

@slashrsm slashrsm May 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This belongs to another PR. You should separate things.

Copy link
Copy Markdown
Member

@davereid davereid May 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it looks like you're creating new PRs from existing PR branches, which makes things difficult to review. It would help to always create new branches/PRs from 8.x-1.x.

Copy link
Copy Markdown
Member Author

@cs-shadow cs-shadow May 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad. Remnant of previous PR.

while ($node->hasChildNodes()) {
$node->removeChild($node->firstChild);
}
// Finally, append the entity to the DOM node.
$node->appendChild($updated_node);

Expand Down