summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/file/tests/file.test2
-rw-r--r--modules/system/system.module3
2 files changed, 1 insertions, 4 deletions
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index 0dc3a1c6b..9fa70a959 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -14,7 +14,7 @@ class FileFieldTestCase extends DrupalWebTestCase {
function setUp() {
parent::setUp('file');
- $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer files'));
+ $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content'));
$this->drupalLogin($this->admin_user);
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 67b8c5808..f44ad4ea2 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -217,9 +217,6 @@ function system_permission() {
'administer actions' => array(
'title' => t('Administer actions'),
),
- 'administer files' => array(
- 'title' => t('Administer user-uploaded files'),
- ),
'access administration pages' => array(
'title' => t('Use the administration pages and help'),
),