From 38d6ee8f550a933c4d7b7519a3dc4b9117c966fe Mon Sep 17 00:00:00 2001 From: lyricnz <lyricnz@33667.no-reply.drupal.org> Date: Thu, 16 May 2013 11:19:37 -0700 Subject: [PATCH] Issue #1222750 by Brandonian, twistor, lyricnz: Added SimplePie 1.3 support. --- feeds.module | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/feeds.module b/feeds.module index 4dc7c341..f581d3fd 100644 --- a/feeds.module +++ b/feeds.module @@ -1039,7 +1039,9 @@ function feeds_library_exists($file, $library) { * Checks whether 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.inc', 'simplepie') ); @@ -1049,13 +1051,19 @@ function feeds_simplepie_exists() { * Includes the simplepie library. */ 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) { if (feeds_include_library($file, 'simplepie')) { return TRUE; } } + return FALSE; } -- GitLab