diff --git a/core/modules/file/config/install/file.settings.yml b/core/modules/file/config/install/file.settings.yml index 1b2e70a..54a157d 100644 --- a/core/modules/file/config/install/file.settings.yml +++ b/core/modules/file/config/install/file.settings.yml @@ -4,4 +4,3 @@ description: icon: directory: 'core/modules/file/icons' make_unused_managed_files_temporary: false - diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml index 683234e..3a97af8 100644 --- a/core/modules/file/config/schema/file.schema.yml +++ b/core/modules/file/config/schema/file.schema.yml @@ -21,9 +21,9 @@ file.settings: directory: type: path label: 'Directory' - make_unused_managed_files_temporary: - type: boolean - label: 'Controls if unused files should be marked temporary' + make_unused_managed_files_temporary: + type: boolean + label: 'Controls if unused files should be marked temporary' field.storage_settings.file: type: base_entity_reference_field_settings diff --git a/core/modules/file/file.install b/core/modules/file/file.install index d506faa..8cbd3f4 100644 --- a/core/modules/file/file.install +++ b/core/modules/file/file.install @@ -129,11 +129,6 @@ function file_requirements($phase) { } /** - * @addtogroup updates-8.3.0 - * @{ - */ - -/** * Prevent unused files from being deleted. */ function file_update_8300() { @@ -147,7 +142,3 @@ function file_update_8300() { ->toString() ]); } - -/** - * @} End of "addtogroup updates-8.3.0". - */ \ No newline at end of file diff --git a/core/modules/file/file.module b/core/modules/file/file.module index ac0e0c2..055a786 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -1597,4 +1597,4 @@ function file_system_file_settings_submit($form, FormStateInterface $form_state) \Drupal::configFactory()->getEditable('file.settings') ->set('make_unused_managed_files_temporary', $form_state->getValue('make_unused_managed_files_temporary')) ->save(); -} \ No newline at end of file +} diff --git a/core/modules/file/src/Tests/FileAdminTest.php b/core/modules/file/src/Tests/FileAdminTest.php index c3d5e2d..f352b29 100644 --- a/core/modules/file/src/Tests/FileAdminTest.php +++ b/core/modules/file/src/Tests/FileAdminTest.php @@ -30,4 +30,4 @@ function testFileAdmin() { ->get('make_unused_managed_files_temporary'), 'The file.settings:make_unused_managed_files_temporary has been set to TRUE.'); } -} \ No newline at end of file +} diff --git a/core/modules/system/src/Form/FileSystemForm.php b/core/modules/system/src/Form/FileSystemForm.php index ac70aab..d3a6cae 100644 --- a/core/modules/system/src/Form/FileSystemForm.php +++ b/core/modules/system/src/Form/FileSystemForm.php @@ -116,7 +116,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#title' => t('Default download method'), '#default_value' => $config->get('default_scheme'), '#options' => $options, - '#description' => t('Temporary files are not referenced, but are in the file system and therefore may show up in administrative lists. Warning: If enabled, temporary files will be permanently deleted and may not be recoverable.'), + '#description' => t('This setting is used as the preferred download method. The use of public files is more efficient, but does not provide any access control.'), ]; } @@ -128,7 +128,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#title' => t('Delete temporary files after'), '#default_value' => $config->get('temporary_maximum_age'), '#options' => $period, - '#description' => t('Orphaned files are not referenced from any content but remain in the file system and may appear in administrative listings. Warning: If enabled, orphaned files will be permanently deleted and may not be recoverable.'), + '#description' => t('Temporary files are not referenced, but are in the file system and therefore may show up in administrative lists. Warning: If enabled, temporary files will be permanently deleted and may not be recoverable.'), ]; return parent::buildForm($form, $form_state);