diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2007-03-27 05:13:55 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2007-03-27 05:13:55 +0000 |
| commit | f7440d4d73ec57219af232c135be3b2567dda45f (patch) | |
| tree | a6b7d947eda1c7bfc2197bfb584f7b17143c97a5 /modules/block | |
| parent | f2ca29071fe33603cf22f1603a3e6a61ee9c0814 (diff) | |
| download | brdo-f7440d4d73ec57219af232c135be3b2567dda45f.tar.gz brdo-f7440d4d73ec57219af232c135be3b2567dda45f.tar.bz2 | |
#130971: Kitchen sink (E_NOTICE compliance / Code style / Bugfix in book toc)
Diffstat (limited to 'modules/block')
| -rw-r--r-- | modules/block/block.module | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index d0311a206..a8d795e37 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -191,6 +191,10 @@ function _block_rehash() { // Reinsert new set of blocks into table. foreach ($blocks as $block) { + $block += array( + 'visibility' => NULL, + 'throttle' => NULL, + ); db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, visibility, pages, custom, throttle, title) VALUES ('%s', '%s', '%s', %d, %d, '%s', %d, '%s', %d, %d, '%s')", $block['module'], $block['delta'], $theme_key, $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle'], $block['title']); } db_unlock_tables(); @@ -238,7 +242,7 @@ function block_admin_display($theme = NULL) { ); if ($throttle) { - $form[$i]['throttle'] = array('#type' => 'checkbox', '#default_value' => $block['throttle']); + $form[$i]['throttle'] = array('#type' => 'checkbox', '#default_value' => isset($block['throttle']) ? $block['throttle'] : FALSE); } $form[$i]['configure'] = array('#value' => l(t('configure'), 'admin/build/block/configure/'. $block['module'] .'/'. $block['delta'])); if ($block['module'] == 'block') { @@ -567,6 +571,10 @@ function block_box_delete_submit($form_id, $form_values) { * Define the custom block form. */ function block_box_form($edit = array()) { + $edit += array( + 'info' => '', + 'body' => '', + ); $form['info'] = array( '#type' => 'textfield', '#title' => t('Block description'), |