diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php b/core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php index 3dbbf90..39aa634 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php @@ -19,7 +19,7 @@ * * @var array */ - public static $modules = array('block', 'test_page_test'); + public static $modules = array('block', 'filter', 'test_page_test'); /** * A list of theme regions to test. diff --git a/core/modules/edit/edit.info.yml b/core/modules/edit/edit.info.yml index 4f07cdf..5963e75 100644 --- a/core/modules/edit/edit.info.yml +++ b/core/modules/edit/edit.info.yml @@ -7,3 +7,4 @@ version: VERSION dependencies: - contextual - field + - filter diff --git a/core/modules/filter/filter.info.yml b/core/modules/filter/filter.info.yml index 888f545..bfc4954 100644 --- a/core/modules/filter/filter.info.yml +++ b/core/modules/filter/filter.info.yml @@ -4,5 +4,6 @@ description: 'Filters content in preparation for display.' package: Core version: VERSION core: 8.x -required: true configure: filter.admin_overview +dependencies: + - user diff --git a/core/modules/node/node.info.yml b/core/modules/node/node.info.yml index 181830e..e61b363 100644 --- a/core/modules/node/node.info.yml +++ b/core/modules/node/node.info.yml @@ -5,3 +5,5 @@ package: Core version: VERSION core: 8.x configure: node.overview_types +dependencies: + - text diff --git a/core/modules/text/text.info.yml b/core/modules/text/text.info.yml index beb45e4..71f45bd 100644 --- a/core/modules/text/text.info.yml +++ b/core/modules/text/text.info.yml @@ -6,4 +6,4 @@ version: VERSION core: 8.x dependencies: - field -required: true + - filter diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php index 4983b0f..5cd0f9d 100644 --- a/core/modules/user/lib/Drupal/user/AccountFormController.php +++ b/core/modules/user/lib/Drupal/user/AccountFormController.php @@ -194,21 +194,23 @@ public function form(array $form, array &$form_state) { '#access' => $register && $admin, ); - // Signature. - $form['signature_settings'] = array( - '#type' => 'details', - '#title' => $this->t('Signature settings'), - '#weight' => 1, - '#access' => (!$register && $config->get('signatures')), - ); + if ($this->moduleHandler->moduleExists('filter')) { + // Signature. + $form['signature_settings'] = array( + '#type' => 'details', + '#title' => $this->t('Signature settings'), + '#weight' => 1, + '#access' => (!$register && $config->get('signatures')), + ); - $form['signature_settings']['signature'] = array( - '#type' => 'text_format', - '#title' => $this->t('Signature'), - '#default_value' => $account->getSignature(), - '#description' => $this->t('Your signature will be publicly displayed at the end of your comments.'), - '#format' => $account->getSignatureFormat(), - ); + $form['signature_settings']['signature'] = array( + '#type' => 'text_format', + '#title' => $this->t('Signature'), + '#default_value' => $account->getSignature(), + '#description' => $this->t('Your signature will be publicly displayed at the end of your comments.'), + '#format' => $account->getSignatureFormat(), + ); + } $user_preferred_langcode = $register ? $language_interface->id : $account->getPreferredLangcode(); diff --git a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php b/core/modules/user/lib/Drupal/user/AccountSettingsForm.php index ace1834..69f3ab5 100644 --- a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php +++ b/core/modules/user/lib/Drupal/user/AccountSettingsForm.php @@ -151,14 +151,17 @@ public function buildForm(array $form, array &$form_state) { } // Account settings. + $filter_exists = $this->moduleHandler->moduleExists('filter'); $form['personalization'] = array( '#type' => 'details', '#title' => $this->t('Personalization'), + '#access' => $filter_exists, ); $form['personalization']['user_signatures'] = array( '#type' => 'checkbox', '#title' => $this->t('Enable signatures.'), - '#default_value' => $config->get('signatures'), + '#default_value' => $filter_exists ? $config->get('signatures') : 0, + '#access' => $filter_exists, ); // Default notifications address. diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php b/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php index 25fd8d9..bceb540 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php @@ -19,7 +19,7 @@ class UserSignatureTest extends WebTestBase { * * @var array */ - public static $modules = array('comment'); + public static $modules = array('comment', 'filter'); public static function getInfo() { return array( diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc index 45a76d0..3e940b8 100644 --- a/core/modules/user/user.views.inc +++ b/core/modules/user/user.views.inc @@ -267,18 +267,20 @@ function user_views_data() { ), ); - $data['users']['signature'] = array( - 'title' => t('Signature'), - 'help' => t("The user's signature."), - 'field' => array( - 'id' => 'markup', - 'format' => filter_fallback_format(), - 'click sortable' => FALSE, - ), - 'filter' => array( - 'id' => 'string', - ), - ); + if (\Drupal::moduleHandler()->moduleExists('filter')) { + $data['users']['signature'] = array( + 'title' => t('Signature'), + 'help' => t("The user's signature."), + 'field' => array( + 'id' => 'markup', + 'format' => filter_fallback_format(), + 'click sortable' => FALSE, + ), + 'filter' => array( + 'id' => 'string', + ), + ); + } if (\Drupal::moduleHandler()->moduleExists('content_translation')) { $data['users']['translation_link'] = array( diff --git a/core/modules/views/views.info.yml b/core/modules/views/views.info.yml index 6187d3e..9e9b384 100644 --- a/core/modules/views/views.info.yml +++ b/core/modules/views/views.info.yml @@ -4,3 +4,5 @@ description: 'Create customized lists and queries from your database.' package: Core version: VERSION core: 8.x +dependencies: + - filter diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml index ba41dd5..dca14d0 100644 --- a/core/profiles/standard/standard.info.yml +++ b/core/profiles/standard/standard.info.yml @@ -19,6 +19,7 @@ dependencies: - edit - editor - entity_reference + - filter - help - image - menu @@ -29,6 +30,7 @@ dependencies: - dblog - search - shortcut + - text - toolbar - field_ui - file