From e4a4b7cc7ea4a4f719ef5af394350896c90763b1 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 5 Jul 2009 18:00:11 +0000
Subject: [PATCH] - Patch #506976 by catch: rename hook_perm to
hook_permission.
---
modules/aggregator/aggregator.module | 4 ++--
modules/block/block.module | 4 ++--
modules/blog/blog.module | 4 ++--
modules/blogapi/blogapi.module | 4 ++--
modules/book/book.module | 4 ++--
modules/comment/comment.module | 4 ++--
modules/contact/contact.module | 4 ++--
modules/filter/filter.module | 4 ++--
modules/forum/forum.module | 4 ++--
modules/locale/locale.module | 4 ++--
modules/menu/menu.module | 4 ++--
modules/node/node.module | 4 ++--
modules/path/path.module | 4 ++--
modules/php/php.module | 4 ++--
modules/poll/poll.module | 4 ++--
modules/search/search.module | 4 ++--
modules/simpletest/drupal_web_test_case.php | 2 +-
modules/simpletest/simpletest.module | 4 ++--
modules/simpletest/tests/field_test.module | 4 ++--
modules/simpletest/tests/module_test.module | 4 ++--
modules/statistics/statistics.module | 4 ++--
modules/system/system.api.php | 2 +-
modules/system/system.module | 6 +++---
modules/taxonomy/taxonomy.module | 4 ++--
modules/toolbar/toolbar.module | 4 ++--
modules/translation/translation.module | 4 ++--
modules/upload/upload.module | 4 ++--
modules/user/user.admin.inc | 8 ++++----
modules/user/user.module | 10 +++++-----
profiles/default/default.profile | 2 +-
30 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 10abde5235f5..bd556ed59109 100644
--- a/modules/aggregator/aggregator.module
+++ b/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'),
diff --git a/modules/block/block.module b/modules/block/block.module
index 0a0c7c95453c..848b68e3110c 100644
--- a/modules/block/block.module
+++ b/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'),
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index c0ceee50dded..c45fcea12930 100644
--- a/modules/blog/blog.module
+++ b/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');
}
diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module
index bec00d1dcc0b..17a0071f560f 100644
--- a/modules/blogapi/blogapi.module
+++ b/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'),
diff --git a/modules/book/book.module b/modules/book/book.module
index 825f53dd692c..b9aa9b64cbf3 100644
--- a/modules/book/book.module
+++ b/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'),
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 775a2db254bf..2aacca3d72d3 100644
--- a/modules/comment/comment.module
+++ b/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'),
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index eb3056e3bce5..6d59ebc53ab4 100644
--- a/modules/contact/contact.module
+++ b/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'),
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index f2bb7163438b..7896187e92c2 100644
--- a/modules/filter/filter.module
+++ b/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'),
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index ef5c9517a12f..baac678adac3 100644
--- a/modules/forum/forum.module
+++ b/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'),
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 1f4214c58dc8..cc558048ef59 100644
--- a/modules/locale/locale.module
+++ b/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'),
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 597ee0eb9ee2..46d47bf3954e 100644
--- a/modules/menu/menu.module
+++ b/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'),
diff --git a/modules/node/node.module b/modules/node/node.module
index 28a476d14b81..7fc0e7ab848e 100644
--- a/modules/node/node.module
+++ b/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'),
diff --git a/modules/path/path.module b/modules/path/path.module
index 191ce4f0bc9c..8608a34d274d 100644
--- a/modules/path/path.module
+++ b/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'),
diff --git a/modules/php/php.module b/modules/php/php.module
index d4b4b43a07df..fccb0464a885 100644
--- a/modules/php/php.module
+++ b/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'),
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index ed1b4e90b3f1..5406c4fa14c3 100644
--- a/modules/poll/poll.module
+++ b/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(
diff --git a/modules/search/search.module b/modules/search/search.module
index 5dc426210dc9..9b3c198e79cc 100644
--- a/modules/search/search.module
+++ b/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'),
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 40b3fbd27515..8f03bd5fceb8 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/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;
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index 1bd156a79809..4a131db9b352 100644
--- a/modules/simpletest/simpletest.module
+++ b/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'),
diff --git a/modules/simpletest/tests/field_test.module b/modules/simpletest/tests/field_test.module
index abf6aaf06726..74bba9dcb61e 100644
--- a/modules/simpletest/tests/field_test.module
+++ b/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'),
diff --git a/modules/simpletest/tests/module_test.module b/modules/simpletest/tests/module_test.module
index 33dd979c14f1..331a9d9273b1 100644
--- a/modules/simpletest/tests/module_test.module
+++ b/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'),
);
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 7830b254c6c3..fcf7220dd9c3 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -81,9 +81,9 @@ function statistics_exit() {
}
/**
- * Implement hook_perm().
+ * Implement hook_permission().
*/
-function statistics_perm() {
+function statistics_permission() {
return array(
'access statistics' => array(
'title' => t('Access statistics'),
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index adae28f30598..c14001baae41 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -668,7 +668,7 @@ function hook_system_info_alter(&$info, $file) {
*
* For a detailed usage example, see page_example.module.
*/
-function hook_perm() {
+function hook_permission() {
return array(
'administer my module' => array(
'title' => t('Administer my module'),
diff --git a/modules/system/system.module b/modules/system/system.module
index f8d1abe18a6b..e05e27e5d117 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -193,9 +193,9 @@ function system_theme() {
}
/**
- * Implement hook_perm().
+ * Implement hook_permission().
*/
-function system_perm() {
+function system_permission() {
return array(
'administer site configuration' => array(
'title' => t('Administer site configuration'),
@@ -2206,7 +2206,7 @@ function system_get_module_admin_tasks($module) {
$admin_tasks = array();
$admin_task_count = 0;
// Check for permissions.
- if (in_array($module, module_implements('perm')) && $admin_access) {
+ if (in_array($module, module_implements('permission')) && $admin_access) {
$admin_tasks[-1] = l(t('Configure permissions'), 'admin/user/permissions', array('fragment' => 'module-' . $module));
}
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 8fe47ad6ddb4..9fb5a54d5085 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -7,9 +7,9 @@
*/
/**
- * Implement hook_perm().
+ * Implement hook_permission().
*/
-function taxonomy_perm() {
+function taxonomy_permission() {
return array(
'administer taxonomy' => array(
'title' => t('Administer taxonomy'),
diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module
index cf38e738b2f8..57d7c9b135c0 100644
--- a/modules/toolbar/toolbar.module
+++ b/modules/toolbar/toolbar.module
@@ -7,9 +7,9 @@
*/
/**
- * Implementation of hook_perm().
+ * Implementation of hook_permission().
*/
-function toolbar_perm() {
+function toolbar_permission() {
return array(
'access toolbar' => array(
'title' => t('Access administration toolbar'),
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index de2eb4871d50..18ab50435ba9 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -82,9 +82,9 @@ function _translation_tab_access($node) {
}
/**
- * Implement hook_perm().
+ * Implement hook_permission().
*/
-function translation_perm() {
+function translation_permission() {
return array(
'translate content' => array(
'title' => t('Translate content'),
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 2d1d6aac4242..c73724c3ae7c 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -40,9 +40,9 @@ function upload_theme() {
}
/**
- * Implement hook_perm().
+ * Implement hook_permission().
*/
-function upload_perm() {
+function upload_permission() {
return array(
'upload files' => array(
'title' => t('Upload files'),
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index b5b3e533024d..873ac067c0fc 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 5a5b70f5e8ab..4e5589994077 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);
diff --git a/profiles/default/default.profile b/profiles/default/default.profile
index a0b78930bd60..52aa21068710 100644
--- a/profiles/default/default.profile
+++ b/profiles/default/default.profile
@@ -222,7 +222,7 @@ function default_profile_tasks(&$task, $url) {
variable_set('user_admin_role', $rid);
// Assign all available permissions to this role.
- foreach (module_invoke_all('perm') as $key => $value) {
+ foreach (module_invoke_all('permission') as $key => $value) {
db_insert('role_permission')
->fields(array(
'rid' => $rid,
--
GitLab