diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-11-27 01:26:31 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-11-27 01:26:31 +0000 |
| commit | 3ee7ed6a665c614886fea5e8eb044bcdbc199591 (patch) | |
| tree | 1b4c5b511d8d559f9aca45274cde63f77af1ee06 /modules | |
| parent | 3477fb5f6e6bbcbf2210af3ca3de94b8d9faca29 (diff) | |
| download | brdo-3ee7ed6a665c614886fea5e8eb044bcdbc199591.tar.gz brdo-3ee7ed6a665c614886fea5e8eb044bcdbc199591.tar.bz2 | |
#98078 by Heine. Fix double escaping on admin/build/blocks.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aggregator/aggregator.module | 4 | ||||
| -rw-r--r-- | modules/block/block.module | 6 | ||||
| -rw-r--r-- | modules/menu/menu.module | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 20c99916f..fcc985146 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -251,11 +251,11 @@ function aggregator_block($op = 'list', $delta = 0, $edit = array()) { if ($op == 'list') { $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title'); while ($category = db_fetch_object($result)) { - $block['category-'. $category->cid]['info'] = t('%title category latest items', array('%title' => $category->title)); + $block['category-'. $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title)); } $result = db_query('SELECT fid, title FROM {aggregator_feed} ORDER BY fid'); while ($feed = db_fetch_object($result)) { - $block['feed-'. $feed->fid]['info'] = t('%title feed latest items', array('%title' => $feed->title)); + $block['feed-'. $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title)); } } else if ($op == 'configure') { diff --git a/modules/block/block.module b/modules/block/block.module index 88c172a83..894a39d50 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -118,7 +118,7 @@ function block_block($op = 'list', $delta = 0, $edit = array()) { $result = db_query('SELECT bid, info FROM {boxes} ORDER BY info'); while ($block = db_fetch_object($result)) { - $blocks[$block->bid]['info'] = check_plain($block->info); + $blocks[$block->bid]['info'] = $block->info; } return $blocks; @@ -231,7 +231,7 @@ function block_admin_display($theme = NULL) { foreach ($blocks as $i => $block) { $form[$i]['module'] = array('#type' => 'value', '#value' => $block['module']); $form[$i]['delta'] = array('#type' => 'value', '#value' => $block['delta']); - $form[$i]['info'] = array('#value' => $block['info']); + $form[$i]['info'] = array('#value' => check_plain($block['info'])); $form[$i]['theme'] = array('#type' => 'hidden', '#value' => $theme_key); $form[$i]['weight'] = array('#type' => 'weight', '#default_value' => $block['weight']); $form[$i]['region'] = array('#type' => 'select', @@ -600,7 +600,7 @@ function block_user($type, $edit, &$user, $category = NULL) { $data = module_invoke($block->module, 'block', 'list'); if ($data[$block->delta]['info']) { $return = TRUE; - $form['block'][$block->module][$block->delta] = array('#type' => 'checkbox', '#title' => $data[$block->delta]['info'], '#default_value' => isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : ($block->custom == 1)); + $form['block'][$block->module][$block->delta] = array('#type' => 'checkbox', '#title' => check_plain($data[$block->delta]['info']), '#default_value' => isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : ($block->custom == 1)); } } diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 50b551713..358b5dbf9 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -124,7 +124,7 @@ function menu_block($op = 'list', $delta = 0) { foreach ($root_menus as $mid => $title) { // Default "Navigation" block is handled by user.module. if ($mid != 1) { - $blocks[$mid]['info'] = check_plain($title); + $blocks[$mid]['info'] = $title; } } return $blocks; |