diff --git a/core/modules/user/config/views.view.user_admin_people.yml b/core/modules/user/config/views.view.user_admin_people.yml index 70a864a..7aad56a 100644 --- a/core/modules/user/config/views.view.user_admin_people.yml +++ b/core/modules/user/config/views.view.user_admin_people.yml @@ -676,7 +676,7 @@ display: description: '' use_operator: '0' operator: combine_op - identifier: combine + identifier: user required: '0' remember: '0' multiple: '0' diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php index db52209..38dccbf 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php @@ -49,12 +49,12 @@ function testUserAdmin() { $this->assertRaw($link, 'Found user A edit link on admin users page'); // Filter the users by name/e-mail. - $this->drupalGet('admin/people', array('query' => array('combine' => $user_a->name))); + $this->drupalGet('admin/people', array('query' => array('user' => $user_a->name))); $result = $this->xpath('//table/tbody/tr'); $this->assertEqual(1, count($result), 'Filter by username returned the right amount.'); $this->assertEqual($user_a->name, (string) $result[0]->td[1]->span, 'Filter by username returned the right user.'); - $this->drupalGet('admin/people', array('query' => array('combine' => $user_a->mail))); + $this->drupalGet('admin/people', array('query' => array('user' => $user_a->mail))); $result = $this->xpath('//table/tbody/tr'); $this->assertEqual(1, count($result), 'Filter by username returned the right amount.'); $this->assertEqual($user_a->name, (string) $result[0]->td[1]->span, 'Filter by username returned the right user.');