Skip to content

Issue #188: Don't send empty descriptions to check_markup. #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argiepiano merged 1 commit into from
Feb 5, 2026
Merged

Issue #188: Don't send empty descriptions to check_markup. #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions modules/callbacks.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@ function entity_plus_metadata_taxonomy_term_get_properties($term, array $options
return count(taxonomy_select_nodes($term->tid));

case 'description':
if (empty($term->description)) {
Copy link
Collaborator

@argiepiano argiepiano Feb 5, 2026

Choose a reason for hiding this comment

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

Technically, the problem only happens if $term->description is NULL, not when it's empty. Can you please change empty() to is_null()?

Copy link
Member Author

@laryn laryn Feb 5, 2026

Choose a reason for hiding this comment

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

@argiepiano I don't mind changing it, but is there any value in proceeding if it is empty?

Copy link
Collaborator

@argiepiano argiepiano Feb 5, 2026

Choose a reason for hiding this comment

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

Good question. First I thought it may be appropriate to run filters for the format even if the value was empty. That's exactly what the field module does for rich text fields even when they are empty, and what taxonomy.tokens.inc currently does also (although it will generate into the same warning you see with entity plus if the value is NULL - another bug for another day).

But then I looked at TaxonomyTermController, and there is a check for empty there before calling check_markup(), so I guess that's OK here too. I'll merge

return '';
}
return check_markup($term->description, isset($term->format) ? $term->format : NULL, '', TRUE);

case 'parent':
Expand Down