diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 1fa53e8..1ce9174 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -309,15 +309,38 @@ function theme_system_modules_uninstall($variables) {
'To uninstall @module, the following module must be uninstalled first: @required_modules',
'To uninstall @module, the following modules must be uninstalled first: @required_modules',
array('@module' => $form['modules'][$module]['#module_name'], '@required_modules' => implode(', ', $form['modules'][$module]['#required_by'])));
- $disabled_message = '
' . $disabled_message . '
';
}
else {
$disabled_message = '';
}
+
$rows[] = array(
- array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'),
- '',
- array('data' => drupal_render($form['modules'][$module]['description']) . $disabled_message, 'class' => array('description')),
+ array(
+ 'data' => array(
+ '#type' => 'inline_template',
+ '#template' => '{{ modules }}',
+ '#context' => array('modules' => 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'])),
+ )
+ ),
+ array(
+ 'data' => array(
+ '#type' => 'inline_template',
+ '#template' => '{{ module_description }} {% if disabled_message|default is not empty %} {{ disabled_message }}
{% endif %}',
+ '#context' => array(
+ 'module_description' => drupal_render($form['modules'][$module]['description']),
+ 'disabled_message' => $disabled_message,
+ ),
+ ),
+ 'class' => array('description'),
+ ),
);
}