Projet

Général

Profil

Révision a192dc0b

Ajouté par Assos Assos il y a environ 8 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/feeds/plugins/FeedsFileFetcher.inc
79 79
   *   no files could be found. Never contains directories.
80 80
   */
81 81
  protected function listFiles($dir) {
82
    $dir = file_stream_wrapper_uri_normalize($dir);
82
    // Seperate out string into array of extensions. Make sure its regex safe.
83
    $config = $this->getConfig();
84
    $extensions = array_filter(array_map('preg_quote', explode(' ', $config['allowed_extensions'])));
85
    $regex = '/\.(' . implode('|', $extensions) . ')$/';
83 86
    $files = array();
84
    if ($items = @scandir($dir)) {
85
      foreach ($items as $item) {
86
        if (is_file("$dir/$item") && strpos($item, '.') !== 0) {
87
          $files[] = "$dir/$item";
88
        }
89
      }
87
    foreach (file_scan_directory($dir, $regex) as $file) {
88
      $files[] = $file->uri;
90 89
    }
90

  
91 91
    return $files;
92 92
  }
93 93

  

Formats disponibles : Unified diff