xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fetch content for complex HEAD (#2867)

Browse Source 
* Fix contentSelectorPreviewAction

Was not compatible with https://github.com/FreshRSS/FreshRSS/pull/2588

* Fix lib_phpQuery for <head ...>

#fix https://github.com/FreshRSS/FreshRSS/issues/2864
* Replace split() by explode() for PHP7 compatibility
https://php.net/str-split
* Fix for document with a `<head>` tag more complicated, like `<head
profile="http://www.w3.org/1999/xhtml/vocab">`
pull/2869/head^2
Alexandre Alapetite 5 years ago committed by GitHub
parent 5858aaf7fc
commit 656b61ff29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      app/Controllers/feedController.php
  2. 9
      lib/lib_phpQuery.php

12
app/Controllers/feedController.php
Unescape View File

@ -753,14 +753,20 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
//Check Feed ID validity.
$entryDAO = FreshRSS_Factory::createEntryDao();
$entries = $entryDAO->listWhere('f', $feed_id);
$entry = null;
if (empty($entries)) {
//Get first entry (syntax robust for Generator or Array)
foreach ($entries as $myEntry) {
$entry = $myEntry;
break;
}
if ($entry == null) {
$this->view->fatalError = _t('feedback.sub.feed.selector_preview.no_entries');
return;
}
//Get feed & entry.
$entry = $entries[0];
//Get feed.
$feed = $entry->feed(true);
if (!$feed) {

9
lib/lib_phpQuery.php
Unescape View File

@ -501,9 +501,10 @@ class DOMDocumentWrapper {
$metaContentType = $matches[0][0];
$markup = substr($markup, 0, $matches[0][1])
.substr($markup, $matches[0][1]+strlen($metaContentType));
$headStart = stripos($markup, '<head>');
$markup = substr($markup, 0, $headStart+6).$metaContentType
.substr($markup, $headStart+6);
$headStart = stripos($markup, '<head');
$headStop = stripos($markup, '>', $headStart);
$markup = substr($markup, 0, $headStop+1).$metaContentType
.substr($markup, $headStop+1);
return $markup;
}
protected function charsetAppendToHTML($html, $charset, $xhtml = false) {
@ -4206,7 +4207,7 @@ class phpQueryObject
.($node->getAttribute('id')
? '#'.$node->getAttribute('id'):'')
.($node->getAttribute('class')
? '.'.join('.', split(' ', $node->getAttribute('class'))):'')
? '.'.join('.', explode(' ', $node->getAttribute('class'))):'')
.($node->getAttribute('name')
? '[name="'.$node->getAttribute('name').'"]':'')
.($node->getAttribute('value') && strpos($node->getAttribute('value'), '<'.'?php') === false

Write Preview
Loading…
Cancel
Save