summaryrefslogtreecommitdiff
path: root/modules/block.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/block.module')
-rw-r--r--modules/block.module12
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/block.module b/modules/block.module
index 4b2738e07..d18c84b15 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -323,26 +323,18 @@ function block_admin() {
function block_user($type, &$edit, &$user) {
switch ($type) {
- case "register_form":
- $result = db_query("SELECT * FROM {blocks} WHERE custom = %d ORDER BY module, delta", 1);
-
- while ($block = db_fetch_object($result)) {
- $form .= form_hidden("block][$block->module][$block->delta", $block->status);
- }
-
- return $form;
case "edit_form":
$result = db_query("SELECT * FROM {blocks} WHERE custom = %d ORDER BY module, delta", 1);
while ($block = db_fetch_object($result)) {
$data = module_invoke($block->module, "block", "list");
if ($data[$block->delta]["info"]) {
- $form .= "<tr><td>". $data[$block->delta]["info"] ."</td><td>". form_checkbox(NULL, "block][$block->module][$block->delta", 1, $user->block[$block->module][$block->delta]) ."</td></tr>\n";
+ $form .= form_checkbox($data[$block->delta]['info'], "block][$block->module][$block->delta", 1, $user->block[$block->module][$block->delta]);
}
}
if (isset($form)) {
- return form_item(t("Block configuration"), "<table border=\"0\" cellpadding=\"2\" cellspacing=\"2\">". $form ."</table>", t("Enable the blocks you would like to see displayed in the side bars."));
+ return array(t('Block configuration') => $form);
}
break;