diff --git a/core/modules/content_moderation/content_moderation.install b/core/modules/content_moderation/content_moderation.install index 2389d34..ddeecb5 100644 --- a/core/modules/content_moderation/content_moderation.install +++ b/core/modules/content_moderation/content_moderation.install @@ -11,9 +11,9 @@ function content_moderation_requirements($phase) { $requirements = []; if ($phase === 'install' && \Drupal::moduleHandler()->moduleExists('workspaces')) { - $requirements['workspace_incompatibility'] = [ + $requirements['workspaces_incompatibility'] = [ 'severity' => REQUIREMENT_ERROR, - 'description' => t('Content Moderation can not be installed when Workspace is also installed.'), + 'description' => t('Content Moderation can not be installed when Workspaces is also installed.'), ]; } diff --git a/core/modules/workspaces/workspaces.install b/core/modules/workspaces/workspaces.install index 4bd4493..7bcc18b 100644 --- a/core/modules/workspaces/workspaces.install +++ b/core/modules/workspaces/workspaces.install @@ -12,11 +12,21 @@ */ function workspaces_requirements($phase) { $requirements = []; - if ($phase === 'install' && \Drupal::moduleHandler()->moduleExists('content_moderation')) { - $requirements['workspace_incompatibility'] = [ - 'severity' => REQUIREMENT_ERROR, - 'description' => t('Workspace can not be installed when Content Moderation is also installed.'), - ]; + if ($phase === 'install') { + if (\Drupal::moduleHandler()->moduleExists('content_moderation')) { + $requirements['content_moderation_incompatibility'] = [ + 'severity' => REQUIREMENT_ERROR, + 'description' => t('Workspaces can not be installed when Content Moderation is also installed.'), + ]; + } + if (\Drupal::moduleHandler()->moduleExists('workspace')) { + $requirements['workspace_incompatibility'] = [ + 'severity' => REQUIREMENT_ERROR, + 'description' => t('Workspaces can not be installed when the contributed Workspace module is also installed. See the upgrade path page for more information on how to upgrade.', [ + ':link' => 'https://www.drupal.org/node/2987783', + ]), + ]; + } } return $requirements;