diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php index 8730522..4f5e193 100644 --- a/core/modules/system/src/Tests/Module/UninstallTest.php +++ b/core/modules/system/src/Tests/Module/UninstallTest.php @@ -57,6 +57,10 @@ function testUninstallPage() { $this->drupalGet('admin/modules/uninstall'); $this->assertTitle(t('Uninstall') . ' | Drupal'); + // Be sure labels are rendered properly. + // @see regression https://www.drupal.org/node/2512106 + $this->assertRaw(''); + $this->assertText(\Drupal::translation()->translate('The following reason prevents Node from being uninstalled:')); $this->assertText(\Drupal::translation()->translate('There is content for the entity type: Content')); // Delete the node to allow node to be uninstalled. diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 276e393..ee2831d 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -323,11 +323,13 @@ function theme_system_modules_uninstall($variables) { $rows[] = array( array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'), array( - 'data' => array( - '#type' => 'inline_template', - '#template' => '', - '#context' => array('module_id' => $form['uninstall'][$module]['#id'], 'module_name' => drupal_render($form['modules'][$module]['name'])), - ) + 'data' => SafeMarkup::format( + '', + array( + '@module_id' => $form['uninstall'][$module]['#id'], + '@module_name' => drupal_render($form['modules'][$module]['name']), + ) + ), ), array( 'data' => array(