diff --git a/core/includes/install.inc b/core/includes/install.inc index 0c9eae7..3ab18f6 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -7,8 +7,8 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Drupal\Component\Utility\Crypt; -use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\OpCodeCache; +use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Site\Settings; @@ -1019,23 +1019,14 @@ function drupal_check_module($module) { if (is_array($requirements) && drupal_requirements_severity($requirements) == REQUIREMENT_ERROR) { // Print any error messages foreach ($requirements as $requirement) { - $description_issafe = TRUE; if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { - - if (!SafeMarkup::isSafe($requirement['description'])) { - $description_issafe = FALSE; - } - $message = $requirement['description']; - if (isset($requirement['value']) && $requirement['value']) { $message .= ' (' . t('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) . ')'; } - - if ($description_issafe) { + if (SafeMarkup::isSafe($requirement['description'])) { $message = SafeMarkup::set($message); } - drupal_set_message($message, 'error'); } }