Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2501639 by crowdcg, Cottser, cwells, YesCT, Gábor Hojtsy: Remove SafeMarkup::set in drupal_check_module()

8.0.x
xjm 2015-06-15 15:47:27 -05:00
parent 83c3d9ea1f
commit 5a3e3b1743
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/includes/install.inc
View File

@ -9,7 +9,6 @@ use Drupal\Component\Utility\Unicode;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\OpCodeCache; use Drupal\Component\Utility\OpCodeCache;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Extension\ExtensionDiscovery;
use Drupal\Core\Site\Settings; use Drupal\Core\Site\Settings;
@ -980,14 +979,11 @@ function drupal_check_module($module) {
// Print any error messages // Print any error messages
foreach ($requirements as $requirement) { foreach ($requirements as $requirement) {
if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) {
$message = SafeMarkup::escape($requirement['description']); $message = $requirement['description'];
if (isset($requirement['value']) && $requirement['value']) { 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 drupal_set_message($message, 'error');
// SafeMarkup::escape() method and the concatinated message string is
// designated safe by running through the t() function.
drupal_set_message(SafeMarkup::set($message), 'error');
} }
} }
return FALSE; return FALSE;