diff options
-rw-r--r-- | modules/user/user.admin.inc | 2 | ||||
-rw-r--r-- | modules/user/user.test | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index f317a1bbf..cfe9e2108 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -201,7 +201,7 @@ function user_admin_account() { 'roles' => theme('item_list', array('items' => $users_roles)), 'member_for' => format_interval(REQUEST_TIME - $account->created), 'access' => $account->access ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $account->access))) : t('never'), - 'operations' => array('data' => array('#link' => array('title' => t('edit'), 'href' => "user/$account->uid/edit", 'query' => $destination))), + 'operations' => array('data' => array('#type' => 'link', '#title' => t('edit'), '#href' => "user/$account->uid/edit", '#options' => array('query' => $destination))), ); } diff --git a/modules/user/user.test b/modules/user/user.test index 23ed393c6..47727f8a6 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -982,6 +982,10 @@ class UserAdminTestCase extends DrupalWebTestCase { $this->assertText($user_c->name, t('Found user C on admin users page')); $this->assertText($admin_user->name, t('Found Admin user on admin users page')); + // Test for existence of edit link in table. + $link = l(t('edit'), "user/$user_a->uid/edit", array('query' => array('destination' => 'admin/people'))); + $this->assertRaw($link, t('Found user A edit link on admin users page')); + // Filter the users by permission 'administer taxonomy'. $edit = array(); $edit['permission'] = 'administer taxonomy'; |