From fa3d448fec8609e5af1ddbf86561de4fd089578b Mon Sep 17 00:00:00 2001
From: Gordon Heydon <gordon@heydon.com.au>
Date: Tue, 14 Sep 2010 16:09:11 +1000
Subject: [PATCH] * Fix up the display of the forum action links to display inside forums

---
 modules/forum/forum.module |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git modules/forum/forum.module modules/forum/forum.module
index 4f5ca81..8e60a5a 100644
--- modules/forum/forum.module
+++ modules/forum/forum.module
@@ -168,8 +168,8 @@ function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) {
   global $user;
 
   // Add action link to 'node/add/forum' on 'forum' page.
-  if ($root_path == 'forum') {
-    $tid = (isset($router_item['page_arguments'][0]) ? $router_item['page_arguments'][0] : 0);
+  if ($root_path == 'forum' || $root_path == 'forum/%') {
+    $tid = (isset($router_item['page_arguments'][0]) ? (is_scalar($router_item['page_arguments'][0]) ? $router_item['page_arguments'][0] : $router_item['page_arguments'][0]->tid) : 0);
     $forum_term = forum_forum_load($tid);
     if ($forum_term) {
       $vid = variable_get('forum_nav_vocabulary', 0);
-- 
1.7.0.5

