diff options
Diffstat (limited to 'modules/block.module')
| -rw-r--r-- | modules/block.module | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/block.module b/modules/block.module index 333920156..f94de166c 100644 --- a/modules/block.module +++ b/modules/block.module @@ -96,6 +96,8 @@ function block_menu($may_cache) { function block_block($op = 'list', $delta = 0, $edit = array()) { switch ($op) { case 'list': + $blocks = array(); + $result = db_query('SELECT bid, title, info FROM {boxes} ORDER BY title'); while ($block = db_fetch_object($result)) { $blocks[$block->bid]['info'] = $block->info ? check_plain($block->info) : check_plain($block->title); @@ -455,8 +457,8 @@ function block_box_save($edit, $delta = NULL) { * Menu callback; displays the block overview page. */ function block_admin() { - $edit = $_POST['edit']; - $op = $_POST['op']; + $edit = isset($_POST['edit']) ? $_POST['edit'] : ''; + $op = isset($_POST['op']) ? $_POST['op'] : ''; if ($op == t('Save blocks')) { block_admin_save($edit); @@ -526,7 +528,7 @@ function block_list($region) { if (!count($blocks)) { $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s' AND status = 1 ORDER BY region, weight, module", $theme_key); while ($block = db_fetch_object($result)) { - if(!isset($blocks[$block->region])) { + if (!isset($blocks[$block->region])) { $blocks[$block->region] = array(); } // Use the user's block visibility setting, if necessary @@ -574,7 +576,7 @@ function block_list($region) { } } // Create an empty array if there were no entries - if(!isset($blocks[$region])) { + if (!isset($blocks[$region])) { $blocks[$region] = array(); } return $blocks[$region]; |