From 7addef299c8124a2a6a534efeeee385a565e738c Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 11 Feb 2009 03:38:46 +0000
Subject: #372400 by swentel and BrightLoudNoise: Fix 'delete' link on block
 administration screen.

---
 modules/block/block.admin.inc | 2 +-
 modules/block/block.test      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index 6dd17f308..b039c018f 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -80,7 +80,7 @@ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) {
     );
     if ($block['module'] == 'block') {
       $form[$key]['delete'] = array(
-        '#value' => l(t('delete'),
+        '#markup' => l(t('delete'),
         'admin/build/block/delete/' . $block['delta']),
       );
     }
diff --git a/modules/block/block.test b/modules/block/block.test
index 3fff643de..ea26a247d 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -54,6 +54,7 @@ class BlockTestCase extends DrupalWebTestCase {
     }
 
     // Delete the created box & verify that it's been deleted and no longer appearing on the page.
+    $this->clickLink(t('delete'));
     $this->drupalPost('admin/build/block/delete/' . $bid, array(), t('Delete'));
     $this->assertRaw(t('The block %title has been removed.', array('%title' => $box['info'])), t('Box successfully deleted.'));
     $this->assertNoText(t($box['title']), t('Box no longer appears on page.'));
-- 
cgit v1.2.3