From 7e85262fc3451888b6ef6775ebcfa27680581fd4 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Sat, 23 Nov 2013 13:22:00 -0800
Subject: [PATCH] Issue #2099251 by larowlan, targoo: Missing helper short
 description in forum.

---
 core/modules/forum/forum.module                         | 2 +-
 core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 0741ec82e0c..29decd5c6de 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -58,7 +58,7 @@ function forum_help($path, $arg) {
           'class' => array('more-help-link'),
         ),
       );
-      $output = drupal_render($container);
+      $output .= drupal_render($container);
       return $output;
     case 'admin/structure/forum/add/container':
       return '<p>' . t('Use containers to group related forums.') . '</p>';
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index 81d8d825b32..8e7bbb46461 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -103,6 +103,7 @@ class ForumTest extends WebTestBase {
       'skip comment approval',
       'access comments',
     ));
+    $this->drupalPlaceBlock('system_help_block', array('region' => 'help'));
   }
 
   /**
@@ -257,6 +258,8 @@ class ForumTest extends WebTestBase {
     $this->forumContainer = $this->createForum('container');
     // Verify "edit container" link exists and functions correctly.
     $this->drupalGet('admin/structure/forum');
+    // Verify help text is shown.
+    $this->assertText(t('Forums contain forum topics. Use containers to group related forums'));
     // Verify action links are there.
     $this->assertLink('Add forum');
     $this->assertLink('Add container');