diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-12-28 10:47:33 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-12-28 10:47:33 +0000 |
| commit | baaa21e1316354ada6d985a5b799ce17d6255590 (patch) | |
| tree | dcd7d9a51ad26ff41e6633cca4b5a272ba72eab8 /modules/block.module | |
| parent | 5c0cd3c03f956412c0b0e859d31a1ffe265ef1a1 (diff) | |
| download | brdo-baaa21e1316354ada6d985a5b799ce17d6255590.tar.gz brdo-baaa21e1316354ada6d985a5b799ce17d6255590.tar.bz2 | |
- Tidied up some inconsistencies in the code: scripts/code-style.sh is your friend.
Diffstat (limited to 'modules/block.module')
| -rw-r--r-- | modules/block.module | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/block.module b/modules/block.module index 1fa5673ea..9791267f8 100644 --- a/modules/block.module +++ b/modules/block.module @@ -168,7 +168,7 @@ function block_admin_display() { $delete = ""; } - $rows[] = array($block["info"], array("data" => form_checkbox(NULL, $block["module"]."][".$block["delta"]."][status", 1, $block["status"]), "align" => "center"), array("data" => form_checkbox(NULL, $block["module"]."][".$block["delta"]."][custom", 1, $block["custom"]), "align" => "center"), array("data" => form_checkbox(NULL, $block["module"]."][".$block["delta"]."][throttle", 1, $block["throttle"], NULL, variable_get("throttle_enable", 0) ? NULL : array("disabled" => "disabled")), "align" => "center"), form_weight(NULL, $block["module"]."][".$block["delta"]."][weight", $block["weight"]), form_radios(NULL, $block["module"]."][".$block["delta"]."][region", $block["region"], array(t("left"), t("right"))), form_textfield(NULL, $block["module"]."][".$block["delta"]."][path", $block["path"], 10, 255), + $rows[] = array($block["info"], array("data" => form_checkbox(NULL, $block["module"] ."][". $block["delta"] ."][status", 1, $block["status"]), "align" => "center"), array("data" => form_checkbox(NULL, $block["module"] ."][". $block["delta"] ."][custom", 1, $block["custom"]), "align" => "center"), array("data" => form_checkbox(NULL, $block["module"] ."][". $block["delta"] ."][throttle", 1, $block["throttle"], NULL, variable_get("throttle_enable", 0) ? NULL : array("disabled" => "disabled")), "align" => "center"), form_weight(NULL, $block["module"] ."][". $block["delta"] ."][weight", $block["weight"]), form_radios(NULL, $block["module"] ."][". $block["delta"] ."][region", $block["region"], array(t("left"), t("right"))), form_textfield(NULL, $block["module"] ."][". $block["delta"] ."][path", $block["path"], 10, 255), $edit, $delete); } @@ -376,8 +376,7 @@ function block_list($region) { $result = db_query("SELECT * FROM {blocks} WHERE (status = '1' OR custom = '1') ". ($region != "all" ? "AND region = %d " : "") ."ORDER BY weight, module", $region == "left" ? 0 : 1); while ($result && ($block = db_fetch_array($result))) { - if ((($block['status'] && (!$user->uid || !$block['custom'])) || ($block['custom'] && $user->block[$block['module']][$block['delta']])) && - (!$block['path'] || preg_match($block['path'], str_replace("?q=", "", request_uri())))) { + if ((($block['status'] && (!$user->uid || !$block['custom'])) || ($block['custom'] && $user->block[$block['module']][$block['delta']])) && (!$block['path'] || preg_match($block['path'], str_replace("?q=", "", request_uri())))) { /* ** Check the current throttle status and see if block should be displayed |