diff options
| author | zotlabs <mike@macgirvin.com> | 2019-11-08 13:10:24 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-11-08 13:10:24 -0800 |
| commit | 00dd52317adb0f7db339649e076df331975a8398 (patch) | |
| tree | d9559c19aafb1fb0ead583aeab662b1f9a94d2a5 /vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php | |
| parent | 17522b31e9d7f092ecf5565ec28be270af7fad7b (diff) | |
| parent | 163b1ee9f82985755f8e74fd144780ae08ce4030 (diff) | |
| download | volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.tar.gz volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.tar.bz2 volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php')
| -rw-r--r-- | vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php index b573426de..ca5f25b84 100644 --- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php +++ b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php @@ -74,7 +74,12 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer } set_error_handler(array($this, 'muteErrorHandler')); - $doc->loadHTML($html, $options); + // loadHTML() fails on PHP 5.3 when second parameter is given + if ($options) { + $doc->loadHTML($html, $options); + } else { + $doc->loadHTML($html); + } restore_error_handler(); $body = $doc->getElementsByTagName('html')->item(0)-> // <html> |