#98078 by Heine. Fix double escaping on admin/build/blocks.

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') {

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));
           }
         }
 

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;