@@ -147,7 +147,7 @@ function dashboard_permission() {
returnarray(
'access dashboard'=>array(
'title'=>t('View the administrative dashboard'),
'description'=>t('Access the site-wide dashboard. Modifying the dashboard requires the "Administer blocks" permission.'),
'description'=>t('Note: modifying the dashboard requires the !administer_blocks permission.',array('!administer_blocks'=>l(t('Administer blocks'),'admin/config/people/permissions',array('fragment'=>'module-block')))),
@@ -272,8 +272,8 @@ function filter_admin_format_title($format) {
*/
functionfilter_permission(){
$perms['administer filters']=array(
'title'=>t('Administer filters'),
'description'=>t('Manage text formats and filters, and use any of them, without restriction, when entering or editing content. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'title'=>t('Administer and use any text formats and filters'),
'description'=>theme('placeholder',array('text'=>t('Warning: This permission may have security implications depending on how the text format is configured.'))),
);
// Generate permissions for each text format. Warn the administrator that any
...
...
@@ -285,8 +285,8 @@ function filter_permission() {
'title'=>t("Use the %text_format text format",array('%text_format'=>$format->name)),
'description'=>t('Use !text_format in forms when entering or editing content. %warning',array('!text_format'=>$format_name_replacement,'%warning'=>t('Warning: This permission may have security implications depending on how the text format is configured.'))),
'title'=>t("Use the !text_format text format",array('!text_format'=>$format_name_replacement,)),
'description'=>theme('placeholder',array('text'=>t('Warning: This permission may have security implications depending on how the text format is configured.'))),
@@ -1401,39 +1401,32 @@ function node_permission() {
$perms=array(
'administer content types'=>array(
'title'=>t('Administer content types'),
'description'=>t('Manage content types and content type administration settings.'),
),
'administer nodes'=>array(
'title'=>t('Administer nodes'),
'description'=>t('Manage all information associated with site content, such as author, publication date and current revision. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'title'=>t('Administer content'),
'description'=>theme('placeholder',array('text'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
),
'access content'=>array(
'title'=>t('Access content'),
'description'=>t('View published content.'),
'title'=>t('View published content'),
),
'access content overview'=>array(
'title'=>t('Access content overview'),
'description'=>t('Access the content overview page.'),
'title'=>t('Access the content overview page'),
),
'bypass node access'=>array(
'title'=>t('Bypass node access'),
'description'=>t('View, edit and delete all site content. Users with this permission will bypass any content-related access control. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'title'=>t('Bypass content access control'),
'description'=>t('View, edit and delete all content regardless of permission restrictions. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
),
'view revisions'=>array(
'title'=>t('View revisions'),
'description'=>t('View content revisions.'),
'title'=>t('View content revisions'),
),
'revert revisions'=>array(
'title'=>t('Revert revisions'),
'description'=>t('Replace content with an older revision.'),
'title'=>t('Revert content revisions'),
),
'delete revisions'=>array(
'title'=>t('Delete revisions'),
'description'=>t('Delete content revisions.'),
'title'=>t('Delete content revisions'),
),
'view own unpublished content'=>array(
'title'=>t('View own unpublished content'),
'description'=>t('View unpublished content created by the user'),
),
);
...
...
@@ -2529,24 +2522,19 @@ function node_list_permissions($type) {
// Build standard list of node permissions for this type.
'description'=>t('Enter PHP in settings fields where PHP is allowed. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'description'=>theme('placeholder',array('text'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'description'=>t('Manage and run automated testing. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'title'=>t('Administer tests'),
'description'=>theme('placeholder',array('text'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
@@ -726,27 +726,25 @@ function user_permission() {
returnarray(
'administer permissions'=>array(
'title'=>t('Administer permissions'),
'description'=>t('Manage the permissions assigned to user roles. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'description'=>theme('placeholder',array('text'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
),
'administer users'=>array(
'title'=>t('Administer users'),
'description'=>t('Manage or block users, and manage their role assignments. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'description'=>theme('placeholder',array('text'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
),
'access user profiles'=>array(
'title'=>t('Access user profiles'),
'description'=>t('View profiles of users on the site, which may contain personal information.'),
'title'=>t('View user profiles'),
),
'change own username'=>array(
'title'=>t('Change own username'),
'description'=>t('Select a different username.'),
),
'cancel account'=>array(
'title'=>t('Cancel account'),
'description'=>t('Remove or disable own user account and unpublish, anonymize, or remove own submissions depending on the configured <a href="@user-settings-url">user settings</a>.',array('@user-settings-url'=>url('admin/config/people/accounts'))),
'title'=>t('Cancel own user account'),
'description'=>t('Note: content may be kept, unpublished, deleted or transfered to the %anonymous-name user depending on the configured <a href="@user-settings-url">user settings</a>.',array('%anonymous-name'=>variable_get('anonymous',t('Anonymous')),'@user-settings-url'=>url('admin/config/people/accounts'))),
),
'select account cancellation method'=>array(
'title'=>t('Select method for cancelling own account'),
'description'=>t('Select the method for cancelling own user account. %warning',array('%warning'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),
'description'=>theme('placeholder',array('text'=>t('Warning: Give to trusted roles only; this permission has security implications.'))),