diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-09-24 00:37:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-09-24 00:37:45 +0000 |
| commit | c9de4646c570a45de03d6e7ec470daf01a8d2cab (patch) | |
| tree | 5d8781ec52d1cf25c5ca1a842d2a7a65bf0f7e95 /modules/forum | |
| parent | 4bd74a00668557ce827e4c51d7c278548518aaf8 (diff) | |
| download | brdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.gz brdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.bz2 | |
- Patch #907690 by sun, pwolanin: breadcrumbs don't work for dynamic paths and local tasks #2.
Diffstat (limited to 'modules/forum')
| -rw-r--r-- | modules/forum/forum.module | 2 | ||||
| -rw-r--r-- | modules/forum/forum.test | 22 |
2 files changed, 19 insertions, 5 deletions
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()); } |