Commit fa60c763 authored by Dries's avatar Dries
Browse files

- Patch #81809 by John: removed stray variables.

parent fd210c34
......@@ -857,7 +857,7 @@ function user_auth_help_links() {
function user_login($msg = '') {
global $user, $base_url;
global $user;
// If we are already logged on, go to the user page instead.
if ($user->uid) {
......@@ -1378,7 +1378,7 @@ function user_edit($category = 'account') {
drupal_goto('admin/user/user');
}
else {
return drupal_get_form('user_confirm_delete', $name, $uid);
return drupal_get_form('user_confirm_delete', $account->name, $account->uid);
}
}
else if ($_POST['op'] == t('Delete')) {
......@@ -1750,7 +1750,6 @@ function user_admin_perm($str_rids = NULL) {
}
// Compile role array:
$roles = array();
while ($role = db_fetch_object($result)) {
$role_permissions[$role->rid] = $role->perm;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment