Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.426
diff -u -p -r1.426 block.module
--- modules/block/block.module	8 Jul 2010 03:41:27 -0000	1.426
+++ modules/block/block.module	27 Jul 2010 10:52:03 -0000
@@ -60,10 +60,11 @@ function block_help($path, $arg) {
       $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can <a href="@block-add">add custom blocks</a>, which are then listed on the <a href="@blocks">Blocks administration page</a>. Once created, custom blocks behave just like default and module-generated blocks.', array('@blocks' => url('admin/structure/block'), '@block-add' => url('admin/structure/block/add'))) . '</dd>';
       $output .= '</dl>';
       return $output;
-    case 'admin/structure/block/add':
+  }
+  if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg[2] == 'block' && ($arg[3] == 'add' || ($arg[3] == 'list' && $arg[5] == 'add'))) {
       return '<p>' . t('Use this page to create a new custom block.') . '</p>';
   }
-  if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) {
+  if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg[2] == 'block' && (empty($arg[3]) || ($arg[3] == 'list' && empty($arg[5])))) {
     $demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'bartik');
     $themes = list_themes();
     $output = '<p>' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the <em>Save blocks</em> button at the bottom of the page. Click the <em>configure</em> link next to each block to configure its specific title and visibility settings.') . '</p>';
Index: modules/block/block.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.test,v
retrieving revision 1.54
diff -u -p -r1.54 block.test
--- modules/block/block.test	8 Jul 2010 03:41:27 -0000	1.54
+++ modules/block/block.test	27 Jul 2010 10:52:03 -0000
@@ -298,6 +298,9 @@ class NonDefaultBlockAdmin extends Drupa
     $this->drupalLogin($admin_user);
     theme_enable(array('stark'));
     $this->drupalGet('admin/structure/block/list/stark');
+    $this->assertText(t('This page provides a drag-and-drop interface'), t('Help text displayed correctly.'));
+    $this->drupalGet('admin/structure/block/list/stark/add');
+    $this->assertText(t('Use this page to create a new custom block.'), t('Help text displayed correctly.'));
   }
 }