Commit b7ac60be authored by Joël Pittet's avatar Joël Pittet 🥸
Browse files

Issue #3112921: Update SimplePie $file paths in feeds_simplepie_exists()

parent 38f6f294

README.txt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ SimplePie Installation 


- To install the SimplePie parser plugin, complete the following steps:

  1. Download SimplePie from http://simplepie.org/downloads. The recommended

     version is: 1.3.

     version is: 1.5.6.

  2. Decompress the downloaded zip file.

  3. Rename the uncompressed folder to 'simplepie'.

     For example rename 'simplepie-simplepie-e9472a1' to 'simplepie'.

feeds.install

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ function feeds_requirements($phase) { 
    $args = array(

      '!url' => 'http://simplepie.org/downloads/',

      '%folder' => $folder,

      '%file' => 'simplepie.compiled.php',

      '%file' => 'library/SimplePie.php',

    );

    $requirements['simplepie']['description'] .= $t('<br />Download the compiled, single-file version of the library from the <a href="!url">SimplePie download page</a>, place it into %folder and rename it to %file.', $args);

    $requirements['simplepie']['severity'] = REQUIREMENT_ERROR;

feeds.module

+2 −6
Original line number Diff line number Diff line
@@ -1411,9 +1411,7 @@ function feeds_library_exists($file, $library) { 
function feeds_simplepie_exists() {

  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')

    feeds_library_exists('library/SimplePie.php', 'simplepie')

  );

}
@@ -1423,9 +1421,7 @@ function feeds_simplepie_exists() { 
function feeds_include_simplepie() {

  $files = array(

    'autoloader.php',

    'simplepie.mini.php',

    'simplepie.compiled.php',

    'simplepie.inc',

    'library/SimplePie.php',

  );



  foreach ($files as $file) {

tests/feeds_mapper_file.test

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ class FeedsMapperFileTestCase extends FeedsMapperTestCase { 
   */

  protected function requireSimplePie() {

    if (!feeds_simplepie_exists()) {

      $this->downloadExtractSimplePie('1.3');

      $this->downloadExtractSimplePie('1.5.6');

      $this->assertTrue(feeds_simplepie_exists());

      // Reset all the caches!

      $this->resetAll();

tests/feeds_parser_syndication.test

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class FeedsSyndicationParserTestCase extends FeedsMapperTestCase { 
    // Only download simplepie if the plugin doesn't already exist somewhere.

    // People running tests locally might have it.

    if (!feeds_simplepie_exists()) {

      $this->downloadExtractSimplePie('1.3');

      $this->downloadExtractSimplePie('1.5.6');

      $this->assertTrue(feeds_simplepie_exists());

      // Reset all the caches!

      $this->resetAll();