diff --git a/core/includes/install.inc b/core/includes/install.inc index 01d6166..4228dfe 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -980,14 +980,12 @@ function drupal_check_module($module) { // Print any error messages foreach ($requirements as $requirement) { if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { - $message = SafeMarkup::escape($requirement['description']); + $message = $requirement['description']; if (isset($requirement['value']) && $requirement['value']) { - $message .= ' (' . t('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) . ')'; + $currently_using = t('(Currently using @item @version)', array('@item' => $requirement['title'], '@version' => $requirement['value'])); + $message = SafeMarkup::format('@message (@currently_using)', ['@message' => $message, '@currently_using' => $currently_using]); } - // The string was previously checked as safe or escaped properly with - // SafeMarkup::escape() method and the concatinated message string is - // designated safe by running through the t() function. - drupal_set_message(SafeMarkup::set($message), 'error'); + drupal_set_message($message, 'error'); } } return FALSE;