summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-02-20 13:46:43 +0000
committerDries Buytaert <dries@buytaert.net>2008-02-20 13:46:43 +0000
commit584f3e886a7c9850d53fedaab2c8f3d0249bda10 (patch)
tree8a089ab394e25f3703e9e47912ca242e0550be5d /modules/user/user.module
parent8e0d6b4690866b3dd39bd4128e9845d9fb79b6fc (diff)
downloadbrdo-584f3e886a7c9850d53fedaab2c8f3d0249bda10.tar.gz
brdo-584f3e886a7c9850d53fedaab2c8f3d0249bda10.tar.bz2
- Patch #30984 by webchick, keith.smith, kkaefer, Crell et al: provide descriptions for permissions on the permission administration page.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module7
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 0effc2601..d59cd9d99 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -491,7 +491,12 @@ function user_is_blocked($name) {
* Implementation of hook_perm().
*/
function user_perm() {
- return array('administer permissions', 'administer users', 'access user profiles', 'change own username');
+ return array(
+ 'administer permissions' => t('Manage the permissions assigned to user roles. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+ 'administer users' => t('Manage or block users, and manage their role assignments.'),
+ 'access user profiles' => t('View profiles of users on the site, which may contain personal information.'),
+ 'change own username' => t('Select a different username.'),
+ );
}
/**