From c9e9c0e1b1a3ea9ab066b2c81bdf4011e033763e Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Fri, 17 Sep 2010 22:25:07 +0000
Subject: [PATCH] Convert file_check_directory().
---
includes/FeedsBatch.inc | 2 +-
plugins/FeedsFileFetcher.inc | 2 +-
plugins/FeedsSimplePieParser.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/includes/FeedsBatch.inc b/includes/FeedsBatch.inc
index 0a703060..99d71500 100644
--- a/includes/FeedsBatch.inc
+++ b/includes/FeedsBatch.inc
@@ -190,7 +190,7 @@ class FeedsImportBatch extends FeedsBatch {
public function getFilePath() {
if (!isset($this->file_path)) {
$dir = file_directory_path() .'/feeds';
- if (!file_check_directory($dir, TRUE)) {
+ if (!file_prepare_directory($dir, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS)) {
throw new Exception(t('Feeds directory either cannot be created or is not writable.'));
}
$dest = file_destination($dir . '/' . get_class($this) .'_'. drupal_get_token($this->url) .'_'. time(), FILE_EXISTS_RENAME);
diff --git a/plugins/FeedsFileFetcher.inc b/plugins/FeedsFileFetcher.inc
index 07226c39..0385458d 100644
--- a/plugins/FeedsFileFetcher.inc
+++ b/plugins/FeedsFileFetcher.inc
@@ -88,7 +88,7 @@ class FeedsFileFetcher extends FeedsFetcher {
*/
public function sourceFormValidate(&$values) {
$feed_dir = file_directory_path() .'/feeds';
- file_check_directory($feed_dir, TRUE);
+ file_prepare_directory($dir, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
// If there is a file uploaded, save it, otherwise validate input on
// file.
diff --git a/plugins/FeedsSimplePieParser.inc b/plugins/FeedsSimplePieParser.inc
index b4711b12..18875688 100644
--- a/plugins/FeedsSimplePieParser.inc
+++ b/plugins/FeedsSimplePieParser.inc
@@ -212,7 +212,7 @@ class FeedsSimplePieParser extends FeedsParser {
*/
protected function cacheDirectory() {
$directory = file_directory_path() .'/simplepie';
- file_check_directory($directory, TRUE);
+ file_prepare_directory($dir, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
return $directory;
}
--
GitLab