--- system.module 2007-11-25 21:31:31.000000000 +0100
+++ system.module.old 2007-10-17 23:29:00.000000000 +0200
@@ -1263,7 +1263,6 @@
$form['name'][$filename] = array('#value' => $file->info['name']);
$form['version'][$filename] = array('#value' => $file->info['version']);
$form['description'][$filename] = array('#value' => t($file->info['description']));
- /*$form['dependencies'][$filename] = array('#value' => t('Dependencies'));*/
$options[$filename] = '';
if ($file->status) {
$status[] = $file->name;
@@ -1293,7 +1292,7 @@
// Add text for dependencies.
if (!empty($dependencies)) {
- $form['dependencies'][$filename] = array(
+ $form['description'][$filename]['dependencies'] = array(
'#value' => t('Depends on: !dependencies', array('!dependencies' => implode(', ', $dependencies))),
'#prefix' => '
',
'#suffix' => '
',
@@ -1302,7 +1301,7 @@
}
// Mark dependents disabled so user can not remove modules being depended on.
- /*$dependents = array();
+ $dependents = array();
if (is_array($file->info['dependents'])) {
foreach ($file->info['dependents'] as $dependent) {
if ($files[$dependent]->status == 1) {
@@ -1314,16 +1313,16 @@
$dependents[] = $files[$dependent]->info['name'] . t(' (disabled)');
}
}
- }*/
+ }
// Add text for enabled dependents.
-/* if (!empty($dependents)) {
+ if (!empty($dependents)) {
$form['description'][$filename]['required'] = array(
'#value' => t('Required by: !required', array('!required' => implode(', ', $dependents))),
'#prefix' => '',
'#suffix' => '
',
- )
-}*/
+ );
+ }
}
// Merge in required modules.
@@ -1529,7 +1528,6 @@
if (isset($form['confirm'])) {
return drupal_render($form);
}
- drupal_add_js('misc/tabletoggle.js');
// Individual table headers.
$header = array(t('Enabled'));
@@ -1539,7 +1537,6 @@
$header[] = t('Name');
$header[] = t('Version');
$header[] = t('Description');
- $header[] = t('Dependencies');
// Pull package information from module list and start grouping modules.
$modules = $form['validation_modules']['#value'];
@@ -1565,8 +1562,7 @@
$row[] = ''. drupal_render($form['name'][$key]) .'';
$row[] = drupal_render($form['version'][$key]);
$row[] = array('data' => drupal_render($form['description'][$key]), 'class' => 'description');
- $row[] = array('data' => drupal_render($form['dependencies'][$key]), 'class' => 'description');
- $rows[] = array('data' => $row);
+ $rows[] = $row;
}
$fieldset = array(
'#title' => t($package),