summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcatch2011-09-28 02:43:14 +0900
committercatch2011-09-28 02:43:14 +0900
commit3bc98cb77ca2e6759286edff49aa82bf7f07dcc6 (patch)
tree0a7ebb657acf6c07254e93fb2bfaf500fcdf5cdb
parent6bde912ab97ebb5424192548e9a1b80eae4c4e73 (diff)
Issue #1118404 by Damien Tournoud, keichee, bfroehle: Fixed 'Manual updates required' table broken.
-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 35b2929..59858eb 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(