core/modules/file/file.install | 18 +------------ core/modules/file/file.module | 38 --------------------------- core/modules/file/src/Tests/FileAdminTest.php | 33 ----------------------- 3 files changed, 1 insertion(+), 88 deletions(-) diff --git a/core/modules/file/file.install b/core/modules/file/file.install index 89426f8..0fe7014 100644 --- a/core/modules/file/file.install +++ b/core/modules/file/file.install @@ -114,19 +114,6 @@ function file_requirements($phase) { 'value' => $value, 'description' => $description, ]; - - $file_config = \Drupal::configFactory()->get('file.settings'); - $make_unused_managed_files_temporary = $file_config->get('make_unused_managed_files_temporary'); - $requirements['file_orphaned_deletion'] = [ - 'title' => t('Unused file deletion'), - 'description' => t("There are currently known bugs with the identification of unused files in core. This can lead to files being deleted even though they're in use."), - 'value' => $make_unused_managed_files_temporary - ? t('Enabled — to avoid data loss, disable unused file deletion.', [ - ':url' => Url::fromRoute('system.file_system_settings', [], ['fragment' => 'edit-make-unused-managed-files-temporary'])->toString() - ]) - : t('Disabled (no risk of data loss)'), - 'severity' => $make_unused_managed_files_temporary ? REQUIREMENT_WARNING : REQUIREMENT_OK, - ]; } return $requirements; @@ -141,8 +128,5 @@ function file_update_8300() { ->set('make_unused_managed_files_temporary', FALSE) ->save(); - return t('Files that have no remaining usages are no longer deleted by default. It is recommended to leave \'Schedule all unused files for deletion\' disabled to prevent the loss of files.', [ - ':url' => Url::fromRoute('system.file_system_settings', [], ['fragment' => 'edit-make-unused-managed-files-temporary']) - ->toString() - ]); + return t('Files that have no remaining usages are no longer deleted by default.'); } diff --git a/core/modules/file/file.module b/core/modules/file/file.module index e00b2d0..6902db6 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -1568,41 +1568,3 @@ function _views_file_status($choice = NULL) { return $status; } - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function file_form_system_file_system_settings_alter(&$form, FormStateInterface $form_state) { - $config = \Drupal::configFactory()->getEditable('file.settings'); - - $form['temporary_files'] = [ - '#type' => 'details', - '#title' => t('Temporary and other unused files'), - '#open' => TRUE - ]; - - // Move the temporary_maximum_age settings. - $temporary_maximum_age_element = $form['temporary_maximum_age']; - unset($form['temporary_maximum_age']); - $form['temporary_files']['temporary_maximum_age'] = $temporary_maximum_age_element; - - $form['temporary_files']['make_unused_managed_files_temporary'] = [ - '#type' => 'checkbox', - '#title' => t('Schedule all unused files for deletion'), - '#default_value' => $config->get('make_unused_managed_files_temporary'), - '#description' => t('If enabled, all files that are not referenced will be deleted after the time set above. For example, enabling this will delete files that previously were used by deleted content. Warning: There are currently known bugs with file usage counting. It is recommended to leave disabled to prevent the loss of files.'), - ]; - - $form['#submit'][] = 'file_system_file_settings_submit'; -} - -/** - * Form submission handler for system_logging_settings(). - * - * @see syslog_form_system_logging_settings_alter() - */ -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(); -} diff --git a/core/modules/file/src/Tests/FileAdminTest.php b/core/modules/file/src/Tests/FileAdminTest.php deleted file mode 100644 index f352b29..0000000 --- a/core/modules/file/src/Tests/FileAdminTest.php +++ /dev/null @@ -1,33 +0,0 @@ -drupalLogin($this->drupalCreateUser(['administer site configuration'])); - $this->assertFalse($this->config('file.settings') - ->get('make_unused_managed_files_temporary'), 'The file.settings:make_unused_managed_files_temporary is set to FALSE.'); - $this->drupalPostForm('admin/config/media/file-system', ['make_unused_managed_files_temporary' => TRUE], t('Save configuration')); - $this->assertTrue($this->config('file.settings') - ->get('make_unused_managed_files_temporary'), 'The file.settings:make_unused_managed_files_temporary has been set to TRUE.'); - } - -}