diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-03-01 16:03:44 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-03-01 16:03:44 +0100 |
| commit | 467ca9d0deea511700656d4433dbd915b137b748 (patch) | |
| tree | ff0ff334ff5ad8fcca843294980a9247732fe4da | |
| parent | 7c74653cc21b1dda382ec45544ed087d441480a5 (diff) | |
Specific HTML load for lib_phpQuery.php (#4243)
And reverts a less appropriate workaround for the same thing in https://github.com/FreshRSS/FreshRSS/pull/4220
Avoids XML errors when believing that a document might be XML/XHTML.
| -rw-r--r-- | app/Models/Entry.php | 2 | ||||
| -rw-r--r-- | lib/lib_phpQuery.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/Models/Entry.php b/app/Models/Entry.php index ab88d777a..243d557ac 100644 --- a/app/Models/Entry.php +++ b/app/Models/Entry.php @@ -484,7 +484,7 @@ class FreshRSS_Entry extends Minz_Model { /** * @var phpQueryObject @doc */ - $doc = phpQuery::newDocument($html); + $doc = phpQuery::newDocumentHTML($html); if ($maxRedirs > 0) { //Follow any HTML redirection diff --git a/lib/lib_phpQuery.php b/lib/lib_phpQuery.php index 1fabfcb6d..411aa120c 100644 --- a/lib/lib_phpQuery.php +++ b/lib/lib_phpQuery.php @@ -436,8 +436,7 @@ class DOMDocumentWrapper { } protected function isXML($markup) { // return strpos($markup, '<?xml') !== false && stripos($markup, 'xhtml') === false; - $head = substr($markup, 0, 100); - return strpos($head, '<'.'?xml') !== false && stripos($head, '<html ') === false; + return strpos(substr($markup, 0, 100), '<'.'?xml') !== false; } protected function contentTypeToArray($contentType) { $matches = explode(';', trim(strtolower($contentType))); |