From ccecebc2b467ae381a2364a70ae2a916bdcf22be Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Aug 2016 16:35:54 +0200
Subject: [PATCH 1/2] SimplePie error message XML PCRE

https://github.com/FreshRSS/FreshRSS/issues/1227
---
 app/Models/Feed.php         | 2 +-
 lib/SimplePie/SimplePie.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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..8026fb149 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 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.

From 531f6ada99958553983c258fae444382efa18804 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Aug 2016 16:37:35 +0200
Subject: [PATCH 2/2] SimplePie better message

---
 lib/SimplePie/SimplePie.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php
index 8026fb149..0f2fdbb87 100644
--- a/lib/SimplePie/SimplePie.php
+++ b/lib/SimplePie/SimplePie.php
@@ -1304,7 +1304,7 @@ class SimplePie
 		// Check absolute bare minimum requirements.
 		if (!extension_loaded('xml') || !extension_loaded('pcre'))
 		{
-			$this->error = 'XML and PCRE extensions not loaded!';
+			$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.