From c9de4646c570a45de03d6e7ec470daf01a8d2cab Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 24 Sep 2010 00:37:45 +0000
Subject: - Patch #907690 by sun, pwolanin: breadcrumbs don't work for dynamic
 paths and local tasks #2.

---
 modules/forum/forum.module |  2 --
 modules/forum/forum.test   | 22 +++++++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'modules/forum')

diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index a0e8b4c97..ed7129c81 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -147,7 +147,6 @@ function forum_menu() {
     'page callback' => 'forum_form_main',
     'page arguments' => array('container', 5),
     'access arguments' => array('administer forums'),
-    'type' => MENU_CALLBACK,
     'file' => 'forum.admin.inc',
   );
   $items['admin/structure/forum/edit/forum/%taxonomy_term'] = array(
@@ -155,7 +154,6 @@ function forum_menu() {
     'page callback' => 'forum_form_main',
     'page arguments' => array('forum', 5),
     'access arguments' => array('administer forums'),
-    'type' => MENU_CALLBACK,
     'file' => 'forum.admin.inc',
   );
   return $items;
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index 786913ace..110dc3267 100644
--- a/modules/forum/forum.test
+++ b/modules/forum/forum.test
@@ -25,9 +25,25 @@ class ForumTestCase extends DrupalWebTestCase {
   function setUp() {
     parent::setUp('taxonomy', 'comment', 'forum');
     // Create users.
-    $this->admin_user = $this->drupalCreateUser(array('administer blocks', 'administer forums', 'administer menu', 'administer taxonomy', 'create forum content')); // 'access administration pages'));
-    $this->edit_any_topics_user = $this->drupalCreateUser(array('create forum content', 'edit any forum content', 'delete any forum content', 'access administration pages'));
-    $this->edit_own_topics_user = $this->drupalCreateUser(array('create forum content', 'edit own forum content', 'delete own forum content'));
+    $this->admin_user = $this->drupalCreateUser(array(
+      'access administration pages',
+      'administer blocks',
+      'administer forums',
+      'administer menu',
+      'administer taxonomy',
+      'create forum content',
+    ));
+    $this->edit_any_topics_user = $this->drupalCreateUser(array(
+      'access administration pages',
+      'create forum content',
+      'edit any forum content',
+      'delete any forum content',
+    ));
+    $this->edit_own_topics_user = $this->drupalCreateUser(array(
+      'create forum content',
+      'edit own forum content',
+      'delete own forum content',
+    ));
     $this->web_user = $this->drupalCreateUser(array());
   }
 
-- 
cgit v1.2.3