Merge pull request #1230 from Alkarex/SimplePie-warning

SimplePie error message XML PCRE
pull/1231/head
Alexandre Alapetite 8 years ago committed by GitHub
commit 07d2015127
  1. 2
      app/Models/Feed.php
  2. 1
      lib/SimplePie/SimplePie.php

@ -241,7 +241,7 @@ class FreshRSS_Feed extends Minz_Model {
if ((!$mtime) || $feed->error()) { if ((!$mtime) || $feed->error()) {
$errorMessage = $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'); $links = $feed->get_links('self');

@ -1304,6 +1304,7 @@ class SimplePie
// Check absolute bare minimum requirements. // Check absolute bare minimum requirements.
if (!extension_loaded('xml') || !extension_loaded('pcre')) if (!extension_loaded('xml') || !extension_loaded('pcre'))
{ {
$this->error = 'XML or PCRE extensions not loaded!';
return false; 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. // 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.

Loading…
Cancel
Save