From 57bdf1b1d3b945184b4800c244f2600292b8b36d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 1 Aug 2011 20:58:40 -0400
Subject: [PATCH] - Patch #613936 by joachim: File_create_htaccess() has an
inconsistent name.
---
includes/file.inc | 8 ++++----
modules/system/system.module | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/includes/file.inc b/includes/file.inc
index bc8ae79d325d..30fd44577515 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -462,11 +462,11 @@ function file_prepare_directory(&$directory, $options = FILE_MODIFY_PERMISSIONS)
* If missing, create a .htaccess file in each Drupal files directory.
*/
function file_ensure_htaccess() {
- file_create_htaccess('public://', FALSE);
+ file_save_htaccess('public://', FALSE);
if (variable_get('file_private_path', FALSE)) {
- file_create_htaccess('private://', TRUE);
+ file_save_htaccess('private://', TRUE);
}
- file_create_htaccess('temporary://', TRUE);
+ file_save_htaccess('temporary://', TRUE);
}
/**
@@ -478,7 +478,7 @@ function file_ensure_htaccess() {
* FALSE indicates that $directory should be an open and public directory.
* The default is TRUE which indicates a private and protected directory.
*/
-function file_create_htaccess($directory, $private = TRUE) {
+function file_save_htaccess($directory, $private = TRUE) {
if (file_uri_scheme($directory)) {
$directory = file_stream_wrapper_uri_normalize($directory);
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 25e1e5f0e8d7..6f0fa2d7d046 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2164,11 +2164,11 @@ function system_check_directory($form_element) {
elseif (is_dir($directory)) {
if ($form_element['#name'] == 'file_public_path') {
// Create public .htaccess file.
- file_create_htaccess($directory, FALSE);
+ file_save_htaccess($directory, FALSE);
}
else {
// Create private .htaccess file.
- file_create_htaccess($directory);
+ file_save_htaccess($directory);
}
}
--
GitLab