diff options
| -rw-r--r-- | modules/book/book.module | 2 | ||||
| -rw-r--r-- | modules/comment/comment.module | 2 | ||||
| -rw-r--r-- | modules/contact/contact.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 4 | ||||
| -rw-r--r-- | modules/path/path.module | 2 | ||||
| -rw-r--r-- | modules/search/search.module | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 4 | ||||
| -rw-r--r-- | modules/user/user.admin.inc | 1 |
8 files changed, 9 insertions, 10 deletions
diff --git a/modules/book/book.module b/modules/book/book.module index 51470470e..81bdb41b3 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -41,9 +41,9 @@ function book_theme() { */ function book_perm() { return array( - 'add content to books' => t('Add new content and child pages to books.'), 'administer book outlines' => t('Manage books through the administration panel.'), 'create new books' => t('Add new top-level books.'), + 'add content to books' => t('Add new content and child pages to books.'), 'access printer-friendly version' => t('View a book page and all of its sub-pages as a single document for ease of printing. Can be performance heavy.'), ); } diff --git a/modules/comment/comment.module b/modules/comment/comment.module index c9f87321c..4604104dc 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -241,10 +241,10 @@ function comment_node_type($op, $info) { */ function comment_perm() { return array( + 'administer comments' => t('Manage and approve comments, and configure comment administration settings.'), 'access comments' => t('View comments attached to content.'), 'post comments' => t('Add comments to content (approval required).'), 'post comments without approval' => t('Add comments to content (no approval required).'), - 'administer comments' => t('Manage and approve comments, and configure comment administration settings.'), ); } diff --git a/modules/contact/contact.module b/modules/contact/contact.module index c82061760..bbe1389c5 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -37,8 +37,8 @@ function contact_help($path, $arg) { */ function contact_perm() { return array( - 'access site-wide contact form' => t('Send feedback to administrators via e-mail using the site-wide contact form.'), 'administer site-wide contact form' => t('Configure site-wide contact form administration settings.'), + 'access site-wide contact form' => t('Send feedback to administrators via e-mail using the site-wide contact form.'), ); } diff --git a/modules/node/node.module b/modules/node/node.module index c23410380..e32f6eaa3 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2872,10 +2872,10 @@ function node_list_permissions($type) { // Build standard list of node permissions for this type. $perms["create $type content"] = t('Create new %type_name content.', array('%type_name' => $info->name)); - $perms["delete any $type content"] = t('Delete any %type_name content, regardless of its author.', array('%type_name' => $info->name)); - $perms["delete own $type content"] = t('Delete %type_name content created by the user.', array('%type_name' => $info->name)); $perms["edit own $type content"] = t('Edit %type_name content created by the user.', array('%type_name' => $info->name)); $perms["edit any $type content"] = t('Edit any %type_name content, regardless of its author.', array('%type_name' => $info->name)); + $perms["delete own $type content"] = t('Delete %type_name content created by the user.', array('%type_name' => $info->name)); + $perms["delete any $type content"] = t('Delete any %type_name content, regardless of its author.', array('%type_name' => $info->name)); return $perms; } diff --git a/modules/path/path.module b/modules/path/path.module index 91abb44d2..f4cb039c2 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -204,8 +204,8 @@ function path_form_alter(&$form, $form_state, $form_id) { */ function path_perm() { return array( - 'create url aliases' => t('Manage URL aliases on content.'), 'administer url aliases' => t('Manage URL aliases across the entire website.'), + 'create url aliases' => t('Manage URL aliases on content.'), ); } diff --git a/modules/search/search.module b/modules/search/search.module index 467f85ff3..022914116 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -142,9 +142,9 @@ function search_theme() { */ function search_perm() { return array( + 'administer search' => t('Configure search administration settings.'), 'search content' => t('Search website content.'), 'use advanced search' => t('Limit search results with additional criteria, such as specific content types. Could have performance implications.'), - 'administer search' => t('Configure search administration settings.'), ); } diff --git a/modules/system/system.module b/modules/system/system.module index 87ad201ab..30bc90980 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -166,11 +166,11 @@ function system_theme() { function system_perm() { return array( 'administer site configuration' => t('Configure site-wide settings such as module or theme administration settings.'), - 'access administration pages' => t('View the administration panel and browse the help system.'), 'administer actions' => t('Manage the actions defined for your site.'), + 'administer files' => t('Manage user-uploaded files.'), + 'access administration pages' => t('View the administration panel and browse the help system.'), 'access site reports' => t('View reports from system logs and other status information.'), 'select different theme' => t('Select a theme other than the default theme set by the site administrator.'), - 'administer files' => t('Manage user-uploaded files.'), 'block IP addresses' => t('Block IP addresses from accessing your site.'), ); } diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index 2f1363b9e..9260da77f 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -515,7 +515,6 @@ function user_admin_perm($form_state, $rid = NULL) { $form['permission'][] = array( '#markup' => $module, ); - ksort($permissions); foreach ($permissions as $perm => $description) { // Account for permissions lacking a description. if (is_int($perm)) { |