Index: database/database.mysql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.mysql,v
retrieving revision 1.168
diff -r1.168 database.mysql
130c130
<   types text NOT NULL
---
>   btypes text NOT NULL
Index: database/database.pgsql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.pgsql,v
retrieving revision 1.103
diff -r1.103 database.pgsql
60c60
<   types text default ''
---
>   btypes text default ''
Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/updates.inc,v
retrieving revision 1.90
diff -r1.90 updates.inc
376c376
<   $ret[] = update_sql("ALTER TABLE vocabulary CHANGE types nodes TEXT DEFAULT '' NOT NULL");
---
>   $ret[] = update_sql("ALTER TABLE vocabulary CHANGE btypes nodes TEXT DEFAULT '' NOT NULL");
2177c2177
<   $ret[] = update_sql("ALTER TABLE {blocks} ADD types text");
---
>   $ret[] = update_sql("ALTER TABLE {blocks} ADD btypes text");
Index: modules/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block.module,v
retrieving revision 1.152
diff -r1.152 block.module
155c155
<           $block['types'] = $old_blocks[$module][$delta]->types;
---
>           $block['btypes'] = $old_blocks[$module][$delta]->types;
159c159
<           $block['pages'] = $block['types'] = '';
---
>           $block['pages'] = $block['btypes'] = '';
163,164c163,164
<         db_query("INSERT INTO {blocks} (module, delta, status, weight, region, visibility, pages, custom, throttle, types) VALUES ('%s', '%s', %d, %d, %d, %d, '%s', %d, %d, '%s')",
<           $block['module'], $block['delta'], $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle'], $block['types']);
---
>         db_query("INSERT INTO {blocks} (module, delta, status, weight, region, visibility, pages, custom, throttle, btypes) VALUES ('%s', '%s', %d, %d, %d, %d, '%s', %d, %d, '%s')",
>           $block['module'], $block['delta'], $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle'], $block['btypes']);
230,231c230,231
<       if ($edit['types']) {
<         $types = implode(',', $edit['types']);
---
>       if ($edit['btypes']) {
>         $types = implode(',', $edit['btypes']);
264c264
<       $group_3 = form_checkboxes(t('Restrict block to specific content types'), 'types', explode(',', $edit['types']), $content_types, t('Selecting one or more content types will cause this block to only be shown on pages of the selected types. This feature works alone or in conjunction with page specific visibility settings. For example, you can specify that a block only appear on book pages in the \'FAQ\' path.'), NULL, FALSE);
---
>       $group_3 = form_checkboxes(t('Restrict block to specific content types'), 'btypes', explode(',', $edit['btypes']), $content_types, t('Selecting one or more content types will cause this block to only be shown on pages of the selected types. This feature works alone or in conjunction with page specific visibility settings. For example, you can specify that a block only appear on book pages in the \'FAQ\' path.'), NULL, FALSE);
438c438
<       if ($block['types'] != '') {
---
>       if ($block['btypes'] != '') {
441c441
<           $types = explode(',', $block['types']);
---
>           $types = explode(',', $block['btypes']);