Skip to content
Snippets Groups Projects
Commit 38d6ee8f authored by lyricnz's avatar lyricnz Committed by Chris Leppanen
Browse files

Issue #1222750 by Brandonian, twistor, lyricnz: Added SimplePie 1.3 support.

parent 004f03c1
No related branches found
No related tags found
No related merge requests found
...@@ -1039,7 +1039,9 @@ function feeds_library_exists($file, $library) { ...@@ -1039,7 +1039,9 @@ function feeds_library_exists($file, $library) {
* Checks whether simplepie exists. * Checks whether simplepie exists.
*/ */
function feeds_simplepie_exists() { function feeds_simplepie_exists() {
return (feeds_library_exists('simplepie.compiled.php', 'simplepie') || return (
feeds_library_exists('autoloader.php', 'simplepie') ||
feeds_library_exists('simplepie.compiled.php', 'simplepie') ||
feeds_library_exists('simplepie.mini.php', 'simplepie') || feeds_library_exists('simplepie.mini.php', 'simplepie') ||
feeds_library_exists('simplepie.inc', 'simplepie') feeds_library_exists('simplepie.inc', 'simplepie')
); );
...@@ -1049,13 +1051,19 @@ function feeds_simplepie_exists() { ...@@ -1049,13 +1051,19 @@ function feeds_simplepie_exists() {
* Includes the simplepie library. * Includes the simplepie library.
*/ */
function feeds_include_simplepie() { function feeds_include_simplepie() {
$files = array('simplepie.mini.php', 'simplepie.compiled.php', 'simplepie.inc'); $files = array(
'autoloader.php',
'simplepie.mini.php',
'simplepie.compiled.php',
'simplepie.inc',
);
foreach ($files as $file) { foreach ($files as $file) {
if (feeds_include_library($file, 'simplepie')) { if (feeds_include_library($file, 'simplepie')) {
return TRUE; return TRUE;
} }
} }
return FALSE; return FALSE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment