From f016b1647bb73df9b1ad9d76cb5357427660ac17 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Tue, 12 Dec 2006 10:11:43 +0000
Subject: #100518: Fix bad URL/callback in access control.

---
 modules/user/user.module | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/user/user.module b/modules/user/user.module
index 5948c384a..f7d435886 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1769,7 +1769,7 @@ function user_roles($membersonly = 0, $permission = 0) {
  * Menu callback: administer permissions.
  */
 function user_admin_perm($rid = NULL) {
-  if ($rid) {
+  if (is_numeric($rid)) {
     $result = db_query('SELECT r.rid, p.perm FROM {role} r LEFT JOIN {permission} p ON r.rid = p.rid WHERE r.rid = %d', $rid);
   }
   else {
@@ -1781,7 +1781,7 @@ function user_admin_perm($rid = NULL) {
     $role_permissions[$role->rid] = $role->perm;
   }
 
-  if ($rid) {
+  if (is_numeric($rid)) {
     $result = db_query('SELECT rid, name FROM {role} r WHERE r.rid = %d ORDER BY name', $rid);
   }
   else {
@@ -2360,7 +2360,7 @@ function user_help($section) {
       <ul>
       <li>Anonymous user: this role is used for users that don\'t have a user account or that are not authenticated.</li>
       <li>Authenticated user: this role is automatically granted to all logged in users.</li>
-      </ul>', array('@permissions' => url('admin/user/access/permissions')));
+      </ul>', array('@permissions' => url('admin/user/access')));
     case 'admin/user/search':
       return '<p>'. t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda".') .'</p>';
     case 'user/help#user':
-- 
cgit v1.2.3