diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ae301b983cd38b6338ee5afb1f3a19214e8d3fc3..ea376bcbe1434ec253a451981cc7d50c7f236c7d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ Feeds 6.x 1.0 XXXXXXXXXXXXXXXXXXXX ---------------------------------- +- #830438 andrewlevine: More secret files in FeedsImportBatch::getFilePath(). - #759302 rjb, smartinm, et. al: Fix user warning: Duplicate entry. - #819876 alex_b: Fix field 'url' and 'guid' don't have default values. - #623444 mongolito404, pvhee, pdrake, servantleader, alex_b et. al.: Mapper for diff --git a/includes/FeedsBatch.inc b/includes/FeedsBatch.inc index 99697f665c1e9ae096ece675ea4dbfb64d4d4d6b..1981205c6dcdba028cdce95f96ed5519cc8fc1b3 100644 --- a/includes/FeedsBatch.inc +++ b/includes/FeedsBatch.inc @@ -98,7 +98,7 @@ class FeedsImportBatch extends FeedsBatch { if (!file_check_directory($dir, TRUE)) { throw new Exception(t('Feeds directory either cannot be created or is not writable.')); } - $dest = file_destination($dir . get_class($this) .'_'. md5($this->url) .'_'. time(), FILE_EXISTS_RENAME); + $dest = file_destination($dir . get_class($this) .'_'. drupal_get_token($this->url) .'_'. time(), FILE_EXISTS_RENAME); $this->file_path = file_save_data($this->getRaw(), $dest); if($this->file_path === 0) { throw new Exception(t('Cannot write content to %dest', array('%dest' => $dest)));