Преглед на файлове

SimplePie error message XML PCRE

https://github.com/FreshRSS/FreshRSS/issues/1227
Alexandre Alapetite преди 9 години
родител
ревизия
ccecebc2b4
променени са 2 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 1 1
      app/Models/Feed.php
  2. 1 0
      lib/SimplePie/SimplePie.php

+ 1 - 1
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');

+ 1 - 0
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.