From c10220f9bf7e5c520cc69b3f106b4fbfb4239505 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 23 Oct 2010 18:25:05 +0000
Subject: [PATCH] #738512 by sun: Fixed Node permissions are ordered oddly.
---
modules/node/node.module | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/node/node.module b/modules/node/node.module
index 710a3851a25f..525412d1615a 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1462,6 +1462,11 @@ function template_preprocess_node(&$variables) {
*/
function node_permission() {
$perms = array(
+ 'bypass node access' => array(
+ 'title' => t('Bypass content access control'),
+ 'description' => t('View, edit and delete all content regardless of permission restrictions.'),
+ 'restrict access' => TRUE,
+ ),
'administer content types' => array(
'title' => t('Administer content types'),
'restrict access' => TRUE,
@@ -1470,16 +1475,14 @@ function node_permission() {
'title' => t('Administer content'),
'restrict access' => TRUE,
),
- 'access content' => array(
- 'title' => t('View published content'),
- ),
'access content overview' => array(
'title' => t('Access the content overview page'),
),
- 'bypass node access' => array(
- 'title' => t('Bypass content access control'),
- 'description' => t('View, edit and delete all content regardless of permission restrictions.'),
- 'restrict access' => TRUE,
+ 'access content' => array(
+ 'title' => t('View published content'),
+ ),
+ 'view own unpublished content' => array(
+ 'title' => t('View own unpublished content'),
),
'view revisions' => array(
'title' => t('View content revisions'),
@@ -1490,9 +1493,6 @@ function node_permission() {
'delete revisions' => array(
'title' => t('Delete content revisions'),
),
- 'view own unpublished content' => array(
- 'title' => t('View own unpublished content'),
- ),
);
// Generate standard node permissions for all applicable node types.
@@ -2925,19 +2925,19 @@ function node_list_permissions($type) {
// Build standard list of node permissions for this type.
$perms = array(
"create $type content" => array(
- 'title' => t('Create new %type_name content', array('%type_name' => $info->name)),
+ 'title' => t('%type_name: Create new content', array('%type_name' => $info->name)),
),
"edit own $type content" => array(
- 'title' => t('Edit own %type_name content', array('%type_name' => $info->name)),
+ 'title' => t('%type_name: Edit own content', array('%type_name' => $info->name)),
),
"edit any $type content" => array(
- 'title' => t('Edit any %type_name content', array('%type_name' => $info->name)),
+ 'title' => t('%type_name: Edit any content', array('%type_name' => $info->name)),
),
"delete own $type content" => array(
- 'title' => t('Delete own %type_name content', array('%type_name' => $info->name)),
+ 'title' => t('%type_name: Delete own content', array('%type_name' => $info->name)),
),
"delete any $type content" => array(
- 'title' => t('Delete any %type_name content', array('%type_name' => $info->name)),
+ 'title' => t('%type_name: Delete any content', array('%type_name' => $info->name)),
),
);
--
GitLab