diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-28 16:38:09 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-08-28 16:38:09 +0200 |
| commit | 07d2015127e934c8e548687a61aa5e0522293758 (patch) | |
| tree | b19ac2970aca58a095f4f4796df27da298ea1c93 | |
| parent | 3d7231be57b5ed4d6f0690474419203117d0d717 (diff) | |
| parent | 531f6ada99958553983c258fae444382efa18804 (diff) | |
Merge pull request #1230 from Alkarex/SimplePie-warning
SimplePie error message XML PCRE
| -rw-r--r-- | app/Models/Feed.php | 2 | ||||
| -rw-r--r-- | lib/SimplePie/SimplePie.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 9855ca742..6104b1e31 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -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'); diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php index 8af55c9fd..0f2fdbb87 100644 --- a/lib/SimplePie/SimplePie.php +++ b/lib/SimplePie/SimplePie.php @@ -1304,6 +1304,7 @@ class SimplePie // Check absolute bare minimum requirements. if (!extension_loaded('xml') || !extension_loaded('pcre')) { + $this->error = 'XML or 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. |