diff --git a/core/core.services.yml b/core/core.services.yml index 434148e..3593a14 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -583,6 +583,10 @@ services: class: Drupal\Core\StreamWrapper\PublicStream tags: - { name: stream_wrapper, scheme: public } + stream_wrapper.private: + class: Drupal\Core\StreamWrapper\PrivateStream + tags: + - { name: stream_wrapper, scheme: private } stream_wrapper.temporary: class: Drupal\Core\StreamWrapper\TemporaryStream tags: diff --git a/core/includes/file.inc b/core/includes/file.inc index 95b5f4d..a0d6dde 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -400,8 +400,8 @@ function file_prepare_directory(&$directory, $options = FILE_MODIFY_PERMISSIONS) */ function file_ensure_htaccess() { file_save_htaccess('public://', FALSE); - $wrapper = \Drupal::service('stream_wrapper_manager')->getViaScheme('private'); - if ($wrapper) { + $private_path = \Drupal::config('system.file')->get('path.private'); + if (!empty($private_path)) { file_save_htaccess('private://', TRUE); } file_save_htaccess('temporary://', TRUE); diff --git a/core/modules/system/system.services.yml b/core/modules/system/system.services.yml index 05a0bb7..54e5b11 100644 --- a/core/modules/system/system.services.yml +++ b/core/modules/system/system.services.yml @@ -20,7 +20,3 @@ services: arguments: ['@batch.storage'] tags: - { name: theme_negotiator, priority: 1000 } - stream_wrapper.private: - class: Drupal\Core\StreamWrapper\PrivateStream - tags: - - { name: stream_wrapper, scheme: private }