summaryrefslogtreecommitdiff
path: root/modules/update
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-09-30 13:08:35 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2011-09-30 13:08:35 -0700
commit97d332b5cd9fa08a33b3c203697b5a927a0f6f40 (patch)
treee2f158eb79bee2ccbd96c1e8c173146b4516219d /modules/update
parentc9aed20995c51dcc1f1241bec5e4a4ca375afb2c (diff)
downloadbrdo-97d332b5cd9fa08a33b3c203697b5a927a0f6f40.tar.gz
brdo-97d332b5cd9fa08a33b3c203697b5a927a0f6f40.tar.bz2
Issue #1118404 by Damien Tournoud, keichee, bfroehle: Fixed 'Manual updates required' table broken.
Diffstat (limited to 'modules/update')
-rw-r--r--modules/update/update.manager.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc
index 35b292905..59858ebe8 100644
--- a/modules/update/update.manager.inc
+++ b/modules/update/update.manager.inc
@@ -162,10 +162,16 @@ function update_manager_update_form($form, $form_state = array(), $context) {
$needs_manual = $project['project_type'] == 'core';
if ($needs_manual) {
- // Since it won't be tableselect, #weight will add an extra column to the
- // table if it's defined, so just unset it. The order doesn't matter that
- // much in the manual updates table, anyway.
+ // There are no checkboxes in the 'Manual updates' table so it will be
+ // rendered by theme('table'), not theme('tableselect'). Since the data
+ // formats are incompatible, we convert now to the format expected by
+ // theme('table').
unset($entry['#weight']);
+ $attributes = $entry['#attributes'];
+ unset($entry['#attributes']);
+ $entry = array(
+ 'data' => $entry,
+ ) + $attributes;
}
else {
$form['project_downloads'][$name] = array(