diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/block/block.module | 2 | ||||
| -rw-r--r-- | modules/system/system.install | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index ecba6810c..9aed0dca5 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -122,7 +122,7 @@ function block_block($op = 'list', $delta = 0, $edit = array()) { case 'list': $blocks = array(); - $result = db_query("SELECT bid, 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, bl.title, info FROM {boxes} bx INNER JOIN {blocks} bl ON bx.bid = bl.delta WHERE module = 'block' ORDER BY title"); while ($block = db_fetch_object($result)) { $blocks[$block->bid]['info'] = $block->info ? check_plain($block->info) : check_plain($block->title); } diff --git a/modules/system/system.install b/modules/system/system.install index ef59aef5e..5753fe205 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -38,7 +38,6 @@ function system_install() { db_query("CREATE TABLE {boxes} ( bid tinyint NOT NULL auto_increment, - title varchar(64) NOT NULL default '', body longtext, info varchar(128) NOT NULL default '', format int NOT NULL default '0', |