diff --git a/composer.lock b/composer.lock index e86554f..bab06ea 100644 --- a/composer.lock +++ b/composer.lock @@ -1061,7 +1061,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/1.0.0", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", "reference": "1.0.0", "shasum": "" }, diff --git a/core/composer.json b/core/composer.json index 15fa324..1a27140 100644 --- a/core/composer.json +++ b/core/composer.json @@ -61,6 +61,7 @@ "drupal/config": "self.version", "drupal/config_translation": "self.version", "drupal/contact": "self.version", + "drupal/content_moderation": "self.version", "drupal/content_translation": "self.version", "drupal/contextual": "self.version", "drupal/core-annotation": "self.version", diff --git a/core/modules/content_moderation/content_moderation.module b/core/modules/content_moderation/content_moderation.module index 5fad236..15a1edc 100644 --- a/core/modules/content_moderation/content_moderation.module +++ b/core/modules/content_moderation/content_moderation.module @@ -32,7 +32,7 @@ function content_moderation_help($route_name, RouteMatchInterface $route_match) case 'help.page.content_moderation': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('Provides basic moderation for content') . '

'; + $output .= '

' . t('The Content Moderation module provides basic moderation for content. For more information, see the online documentation for the Content Moderation module.', array(':content_moderation' => 'https://www.drupal.org/documentation/modules/workbench_moderation/')) . '

'; return $output; default: @@ -189,12 +189,8 @@ function content_moderation_node_access(NodeInterface $entity, $operation, Accou /** * Implements hook_theme(). */ -function content_moderation_theme($existing, $type, $theme, $path) { - $themes['entity_moderation_form'] = [ - 'render element' => 'form', - ]; - - return $themes; +function content_moderation_theme() { + return ['entity_moderation_form' => ['render element' => 'form']]; } /** diff --git a/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php b/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php index 5e2265d..f4e242d 100644 --- a/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php @@ -24,6 +24,7 @@ class StableTemplateOverrideTest extends KernelTestBase { */ protected $templatesToSkip = [ 'views-form-views-form', + 'entity-moderation-form' ]; /**