Don't remove child nodes of figures and images. #321
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
samwilson
force-pushed
the
img-html
branch
4 times, most recently
from
48ec841
to
19174ca
Compare
When processing img elements, this was replacing figure and figure-inline with an img element. This was discarding any figcaption or other contents of the node. It doesn't look like there's any reason to do this replacement, as we're already modifying the img element to our requirements. Also switch to ctype_xdigit to check for the thumb URL segments being valid hex digits, because using is_numeric to do this was deprecated as of PHP 7.0. Also check for any contained img elements in figure etc. and break if none found. Bug: https://phabricator.wikimedia.org/T272307 Bug: https://phabricator.wikimedia.org/T272180
|
Rebased. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When processing img elements, this was replacing figure and
figure-inline with an img element. This was discarding any
figcaption or other contents of the node.
It doesn't look like there's any reason to do this replacement,
as we're already modifying the img element to our requirements.
Also switch to ctype_xdigit to check for the thumb URL segments
being valid hex digits, because using is_numeric to do this was
deprecated as of PHP 7.0.
Also check for any contained img elements in figure etc. and break
if none found.
Bug: https://phabricator.wikimedia.org/T272307
Bug: https://phabricator.wikimedia.org/T272180