From 5a3e3b17436957a4276ca10054785b19f17f58a5 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Mon, 15 Jun 2015 15:47:27 -0500
Subject: [PATCH] =?UTF-8?q?Issue=20#2501639=20by=20crowdcg,=20Cottser,=20c?=
=?UTF-8?q?wells,=20YesCT,=20G=C3=A1bor=20Hojtsy:=20Remove=20SafeMarkup::s?=
=?UTF-8?q?et=20in=20drupal=5Fcheck=5Fmodule()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/includes/install.inc | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 01d61662ee95..31d472ae3459 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -9,7 +9,6 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Drupal\Component\Utility\Crypt;
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;
@@ -980,14 +979,11 @@ 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'])) . ')';
+ $message = t('@requirements_message (Currently using @item version @version)', array('@requirements_message' => $requirement['description'], '@item' => $requirement['title'], '@version' => $requirement['value']));
}
- // 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;
--
GitLab