diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-02-07 05:09:59 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-02-07 05:09:59 +0000 |
| commit | 3729441ace1f10b5f37079a7dfcf9f7f26156213 (patch) | |
| tree | dc27fb20ab26c20dd19e0bc2e08bd3ea3ab80b40 /includes | |
| parent | c197ce35245deff8b6c591215413f13ebd1c2f96 (diff) | |
| download | brdo-3729441ace1f10b5f37079a7dfcf9f7f26156213.tar.gz brdo-3729441ace1f10b5f37079a7dfcf9f7f26156213.tar.bz2 | |
#706860 by hunmonk: Fixed update_fix_d7_block_deltas() helper function broken due to block table rename.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/update.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/update.inc b/includes/update.inc index e16ff1482..952f2c639 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -180,7 +180,8 @@ function update_fix_d7_block_deltas(&$sandbox, $renamed_deltas) { // Loop through each block and make changes to the block tables. // Only run this the first time through the batch update. if (!isset($sandbox['progress'])) { - $block_tables = array('blocks', 'blocks_roles'); + // Determine whether to use the old or new block table names. + $block_tables = db_table_exists('blocks') ? array('blocks', 'blocks_roles') : array('block', 'block_role'); foreach ($block_tables as $table) { foreach ($renamed_deltas as $module => $deltas) { foreach ($deltas as $old_delta => $new_delta) { |