summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-07-05 18:00:11 +0000
committerDries Buytaert <dries@buytaert.net>2009-07-05 18:00:11 +0000
commite4a4b7cc7ea4a4f719ef5af394350896c90763b1 (patch)
tree44e144a7adcce543c98cece4cdf7abb01ccffbfa /modules/user/user.module
parent4a4a6570d8b84f7b58e1f6e27ffc16ee9f9f1789 (diff)
downloadbrdo-e4a4b7cc7ea4a4f719ef5af394350896c90763b1.tar.gz
brdo-e4a4b7cc7ea4a4f719ef5af394350896c90763b1.tar.bz2
- Patch #506976 by catch: rename hook_perm to hook_permission.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 5a5b70f5e..4e5589994 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -745,9 +745,9 @@ function user_is_blocked($name) {
}
/**
- * Implement hook_perm().
+ * Implement hook_permission().
*/
-function user_perm() {
+function user_permission() {
return array(
'administer permissions' => array(
'title' => t('Administer permissions'),
@@ -2394,9 +2394,9 @@ function user_filters() {
}
$options = array();
- foreach (module_implements('perm') as $module) {
- $function = $module . '_perm';
- if ($permissions = $function('perm')) {
+ foreach (module_implements('permission') as $module) {
+ $function = $module . '_permission';
+ if ($permissions = $function('permission')) {
asort($permissions);
foreach ($permissions as $permission => $description) {
$options[t('@module module', array('@module' => $module))][$permission] = t($permission);