summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-08-25 23:54:18 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-08-25 23:54:18 +0000
commit9f641766a47b0eb0cb36e129c662ec51759564dc (patch)
treedc85a307cd7b59e923bb31e264be0418d8fb7a41 /modules
parent21eed1d5a8238a65b8f5ee607a6263c731f1296e (diff)
downloadbrdo-9f641766a47b0eb0cb36e129c662ec51759564dc.tar.gz
brdo-9f641766a47b0eb0cb36e129c662ec51759564dc.tar.bz2
#80352 by Zacker. Manually created blocks now appear in block listing.
Diffstat (limited to 'modules')
-rw-r--r--modules/block/block.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/block/block.module b/modules/block/block.module
index 9aed0dca5..e2e07d921 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -122,9 +122,9 @@ function block_block($op = 'list', $delta = 0, $edit = array()) {
case 'list':
$blocks = array();
- $result = db_query("SELECT bid, bl.title, info FROM {boxes} bx INNER JOIN {blocks} bl ON bx.bid = bl.delta WHERE module = 'block' ORDER BY title");
+ $result = db_query('SELECT bid, info FROM {boxes} ORDER BY info');
while ($block = db_fetch_object($result)) {
- $blocks[$block->bid]['info'] = $block->info ? check_plain($block->info) : check_plain($block->title);
+ $blocks[$block->bid]['info'] = check_plain($block->info);
}
return $blocks;