mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-01-22 04:08:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Specific HTML load for lib_phpQuery.php (#4243)

Browse Source 
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.
This commit is contained in:
Alexandre Alapetite
2022-03-01 16:03:44 +01:00
committed by GitHub
parent 7c74653cc2
commit 467ca9d0de
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Entry.php
View File

@@ -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

3
lib/lib_phpQuery.php
View File

@@ -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)));