From f7440d4d73ec57219af232c135be3b2567dda45f Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Tue, 27 Mar 2007 05:13:55 +0000
Subject: #130971: Kitchen sink (E_NOTICE compliance / Code style / Bugfix in
 book toc)

---
 modules/block/block.module | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'modules/block')

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'),
-- 
cgit v1.2.3