- Patch #506976 by catch: rename hook_perm to hook_permission.

2 files changed, 9 insertions, 9 deletions

diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index b5b3e5330..873ac067c 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -606,8 +606,8 @@ function user_admin_perm($form_state, $rid = NULL) {
   // Render role/permission overview:
   $options = array();
   $hide_descriptions = !system_admin_compact_mode();
-  foreach (module_implements('perm') as $module) {
-    if ($permissions = module_invoke($module, 'perm')) {
+  foreach (module_implements('permission') as $module) {
+    if ($permissions = module_invoke($module, 'permission')) {
       $info = drupal_parse_info_file(drupal_get_path('module', $module) . "/$module.info");
       $form['permission'][] = array(
         '#markup' => $info['name'],
@@ -933,7 +933,7 @@ function user_modules_installed($modules) {
   $rid = variable_get('user_admin_role', 0);
   if ($rid) {
     foreach ($modules as $module) {
-      if ($permissions = module_invoke($module, 'perm')) {
+      if ($permissions = module_invoke($module, 'permission')) {
         foreach (array_keys($permissions) as $permission) {
           db_insert('role_permission')
             ->fields(array(
@@ -952,7 +952,7 @@ function user_modules_installed($modules) {
 function user_modules_uninstalled($modules) {
   $permissions = array();
   foreach ($modules as $module) {
-    $permissions = array_merge($permissions, array_keys(module_invoke($module, 'perm')));
+    $permissions = array_merge($permissions, array_keys(module_invoke($module, 'permission')));
   }
   if (!empty($permissions)) {
     db_delete('role_permission')
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);