SimplePie error message XML PCRE

https://github.com/FreshRSS/FreshRSS/issues/1227
This commit is contained in:
Alexandre Alapetite
2016-08-28 16:35:54 +02:00
parent 3d7231be57
commit ccecebc2b4
2 changed files with 2 additions and 1 deletions

View File

@@ -241,7 +241,7 @@ class FreshRSS_Feed extends Minz_Model {
if ((!$mtime) || $feed->error()) {
$errorMessage = $feed->error();
throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Feed error' : $errorMessage) . ' [' . $url . ']');
throw new FreshRSS_Feed_Exception(($errorMessage == '' ? 'Unknown error for feed' : $errorMessage) . ' [' . $url . ']');
}
$links = $feed->get_links('self');

View File

@@ -1304,6 +1304,7 @@ class SimplePie
// Check absolute bare minimum requirements.
if (!extension_loaded('xml') || !extension_loaded('pcre'))
{
$this->error = 'XML and PCRE extensions not loaded!';
return false;
}
// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.