summaryrefslogtreecommitdiff
path: root/ext/tidy/tidy.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-07 17:50:24 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-07 17:50:24 +0200
commitc774619118ba8cdfe6ddb33769d99ac425277769 (patch)
treed56130487dc8eae416236715bdbde36559879d96 /ext/tidy/tidy.c
parent91f47ee2633c77f073ee9ea68bb9a28842498304 (diff)
parentff3878adeb5e73e514a0f7a1cb367a3b350301c9 (diff)
downloadphp-git-c774619118ba8cdfe6ddb33769d99ac425277769.tar.gz
Merge branch 'PHP-7.4' into master
* PHP-7.4: Fix #77040: tidyNode::isHtml() is completely broken
Diffstat (limited to 'ext/tidy/tidy.c')
-rw-r--r--ext/tidy/tidy.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 58d398b006..0efa594b69 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1525,11 +1525,14 @@ PHP_METHOD(tidyNode, isHtml)
{
TIDY_FETCH_ONLY_OBJECT;
- if (tidyNodeGetType(obj->node) & (TidyNode_Start | TidyNode_End | TidyNode_StartEnd)) {
- RETURN_TRUE;
+ switch (tidyNodeGetType(obj->node)) {
+ case TidyNode_Start:
+ case TidyNode_End:
+ case TidyNode_StartEnd:
+ RETURN_TRUE;
+ default:
+ RETURN_FALSE;
}
-
- RETURN_FALSE;
}
/* }}} */