From f5e0c1729cecb0f222bb00f421ad873e0e74c8cf Mon Sep 17 00:00:00 2001 From: webchick Date: Thu, 3 Apr 2014 14:25:02 -0700 Subject: [PATCH] Issue #2151123 by joelpittet | Cottser: Remove theme_system_modules_incompatible(). --- .../lib/Drupal/system/Form/ModulesListForm.php | 6 ++---- core/modules/system/system.admin.inc | 15 +-------------- core/modules/system/system.module | 4 ---- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php index 0038505afa1..6453b460579 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php @@ -290,10 +290,8 @@ class ModulesListForm extends FormBase { if (!$compatible) { $status = implode(' ', $reasons); $row['enable']['#disabled'] = TRUE; - $row['description'] = array( - '#theme' => 'system_modules_incompatible', - '#message' => $status, - ); + $row['description']['#markup'] = $status; + $row['#attributes']['class'][] = 'incompatible'; } // If this module requires other modules, add them to the array. diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 8fcbcbdd211..8cc1599bcf5 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -333,7 +333,7 @@ function theme_system_modules_details($variables) { $col4 = drupal_render($details); $row[] = array('class' => array('description', 'expand'), 'data' => $col4); - $rows[] = $row; + $rows[] = $module['#attributes'] + array('data' => $row); } $table = array( @@ -344,19 +344,6 @@ function theme_system_modules_details($variables) { return drupal_render($table); } -/** - * Returns HTML for a message about incompatible modules. - * - * @param $variables - * An associative array containing: - * - message: The form array representing the currently disabled modules. - * - * @ingroup themeable - */ -function theme_system_modules_incompatible($variables) { - return '
' . $variables['message'] . '
'; -} - /** * Returns HTML for a table of currently disabled modules. * diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 3cb4d65aa8d..a870cb3ab99 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -181,10 +181,6 @@ function system_theme() { 'render element' => 'form', 'file' => 'system.admin.inc', ), - 'system_modules_incompatible' => array( - 'variables' => array('message' => NULL), - 'file' => 'system.admin.inc', - ), 'system_modules_uninstall' => array( 'render element' => 'form', 'file' => 'system.admin.inc',