Fix curlopt options for HTML+XPath (#4759)

Improvement of https://github.com/FreshRSS/FreshRSS/pull/4220
This commit is contained in:
Alexandre Alapetite
2022-10-21 15:11:52 +02:00
committed by GitHub
parent 1f4e347cae
commit e96b6266b5

View File

@@ -589,10 +589,9 @@ class FreshRSS_Feed extends Minz_Model {
}
/**
* @param array<string,mixed> $attributes
* @return SimplePie|null
*/
public function loadHtmlXpath(bool $loadDetails = false, bool $noCache = false, array $attributes = []) {
public function loadHtmlXpath(bool $loadDetails = false, bool $noCache = false) {
if ($this->url == '') {
return null;
}
@@ -620,8 +619,8 @@ class FreshRSS_Feed extends Minz_Model {
return null;
}
$cachePath = FreshRSS_Feed::cacheFilename($feedSourceUrl, $attributes, FreshRSS_Feed::KIND_HTML_XPATH);
$html = httpGet($feedSourceUrl, $cachePath, 'html', $attributes);
$cachePath = FreshRSS_Feed::cacheFilename($feedSourceUrl, $this->attributes(), FreshRSS_Feed::KIND_HTML_XPATH);
$html = httpGet($feedSourceUrl, $cachePath, 'html', $this->attributes());
if (strlen($html) <= 0) {
return null;
}