From ed65c9b89fbbc67be49e8c52495cd30f455de49f Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 5 Jul 2009 18:07:04 +0000
Subject: [PATCH] - Patch #510740 by agentrickard: rename user_admin_perm() to
user_admin_permission().
---
modules/user/user.admin.inc | 12 ++++++------
modules/user/user.module | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 873ac067c0fc..121f4b9b0069 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -585,10 +585,10 @@ function user_admin_settings() {
* Menu callback: administer permissions.
*
* @ingroup forms
- * @see user_admin_perm_submit()
- * @see theme_user_admin_perm()
+ * @see user_admin_permissions_submit()
+ * @see theme_user_admin_permissions()
*/
-function user_admin_perm($form_state, $rid = NULL) {
+function user_admin_permissions($form_state, $rid = NULL) {
// Retrieve role names for columns.
$role_names = user_roles();
@@ -645,9 +645,9 @@ function user_admin_perm($form_state, $rid = NULL) {
/**
* Save permissions selected on the administer permissions page.
*
- * @see user_admin_perm
+ * @see user_admin_permissions()
*/
-function user_admin_perm_submit($form, &$form_state) {
+function user_admin_permissions_submit($form, &$form_state) {
foreach ($form_state['values']['role_names'] as $rid => $name) {
$checked = array_filter($form_state['values'][$rid]);
// Delete existing permissions for the role. This handles "unchecking" checkboxes.
@@ -675,7 +675,7 @@ function user_admin_perm_submit($form, &$form_state) {
*
* @ingroup themeable
*/
-function theme_user_admin_perm($form) {
+function theme_user_admin_permissions($form) {
$roles = user_roles();
foreach (element_children($form['permission']) as $key) {
$row = array();
diff --git a/modules/user/user.module b/modules/user/user.module
index 4e5589994077..2eab5b3869c5 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -57,7 +57,7 @@ function user_theme() {
'user_list' => array(
'arguments' => array('users' => NULL, 'title' => NULL),
),
- 'user_admin_perm' => array(
+ 'user_admin_permissions' => array(
'arguments' => array('form' => NULL),
'file' => 'user.admin.inc',
),
@@ -1334,7 +1334,7 @@ function user_menu() {
'title' => 'Permissions',
'description' => 'Determine access to features by selecting permissions for roles.',
'page callback' => 'drupal_get_form',
- 'page arguments' => array('user_admin_perm'),
+ 'page arguments' => array('user_admin_permissions'),
'access arguments' => array('administer permissions'),
);
$items['admin/user/roles'] = array(
--
GitLab