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

modules/aggregator/aggregator.module

@@ -270,9 +270,9 @@ function _aggregator_has_categories() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function aggregator_perm() {
+function aggregator_permission() {
   return array(
     'administer news feeds' => array(
       'title' => t('Administer news feeds'),

modules/block/block.module

@@ -105,9 +105,9 @@ function block_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function block_perm() {
+function block_permission() {
   return array(
     'administer blocks' => array(
       'title' => t('Administer blocks'),

modules/blog/blog.module

@@ -20,9 +20,9 @@ function blog_node_info() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function blog_perm() {
+function blog_permission() {
   return node_list_permissions('blog');
 }
 

modules/blogapi/blogapi.module

@@ -21,9 +21,9 @@ function blogapi_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function blogapi_perm() {
+function blogapi_permission() {
   return array(
     'administer content with blog api' => array(
       'title' => t('Administer content with blog API'),

modules/book/book.module

@@ -37,9 +37,9 @@ function book_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function book_perm() {
+function book_permission() {
   return array(
     'administer book outlines' => array(
       'title' => t('Administer book outlines'),

modules/comment/comment.module

@@ -224,9 +224,9 @@ function comment_node_type($op, $info) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function comment_perm() {
+function comment_permission() {
   return array(
     'administer comments' => array(
       'title' => t('Administer comments'),

modules/contact/contact.module

@@ -33,9 +33,9 @@ function contact_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function contact_perm() {
+function contact_permission() {
   return array(
     'administer site-wide contact form' => array(
       'title' => t('Administer site-wide contact form'),

modules/filter/filter.module

@@ -145,9 +145,9 @@ function filter_admin_format_title($format) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function filter_perm() {
+function filter_permission() {
   return array(
     'administer filters' => array(
       'title' => t('Administer filters'),

modules/forum/forum.module

@@ -419,9 +419,9 @@ function forum_access($op, $node, $account) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function forum_perm() {
+function forum_permission() {
   $perms = array(
     'administer forums' => array(
       'title' => t('Administer forums'),

modules/locale/locale.module

@@ -184,9 +184,9 @@ function locale_inc_callback() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function locale_perm() {
+function locale_permission() {
   return array(
     'administer languages' => array(
       'title' => t('Administer languages'),

modules/menu/menu.module

@@ -33,9 +33,9 @@ function menu_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function menu_perm() {
+function menu_permission() {
   return array(
     'administer menu' => array(
       'title' => t('Administer menu'),

modules/node/node.module

@@ -1261,9 +1261,9 @@ function theme_node_log_message($log) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function node_perm() {
+function node_permission() {
   $perms = array(
     'administer content types' => array(
       'title' => t('Administer content types'),

modules/path/path.module

@@ -256,9 +256,9 @@ function path_form_alter(&$form, $form_state, $form_id) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function path_perm() {
+function path_permission() {
   return array(
     'administer url aliases' => array(
       'title' => t('Administer URL aliases'),

modules/php/php.module

@@ -22,9 +22,9 @@ function php_help($path, $arg) {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function php_perm() {
+function php_permission() {
   return array(
     'use PHP for settings' => array(
       'title' => t('Use PHP for settings'),

modules/poll/poll.module

@@ -51,9 +51,9 @@ function poll_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function poll_perm() {
+function poll_permission() {
   $perms = node_list_permissions('poll');
   $perms += array(
     'vote on polls' => array(

modules/search/search.module

@@ -141,9 +141,9 @@ function search_theme() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function search_perm() {
+function search_permission() {
   return array(
     'administer search' => array(
       'title' => t('Administer search'),

modules/simpletest/drupal_web_test_case.php

@@ -876,7 +876,7 @@ protected function checkPermissions(array $permissions, $reset = FALSE) {
     static $available;
 
     if (!isset($available) || $reset) {
-      $available = array_keys(module_invoke_all('perm'));
+      $available = array_keys(module_invoke_all('permission'));
     }
 
     $valid = TRUE;

modules/simpletest/simpletest.module

@@ -44,9 +44,9 @@ function simpletest_menu() {
 }
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function simpletest_perm() {
+function simpletest_permission() {
   return array(
     'administer unit tests' => array(
       'title' => t('Administer unit tests'),

modules/simpletest/tests/field_test.module

@@ -5,9 +5,9 @@
 define('FIELD_TEST_BUNDLE', 'test_bundle');
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function field_test_perm() {
+function field_test_permission() {
   $perms = array(
     'access field_test content' => array(
       'title' => t('Access field_test content'),

modules/simpletest/tests/module_test.module

@@ -2,9 +2,9 @@
 // $Id$
 
 /**
- * Implement hook_perm().
+ * Implement hook_permission().
  */
-function module_test_perm() {
+function module_test_permission() {
   return array(
     'module_test perm' => t('example perm for module_test module'),
   );