Skip to content

Commit 30eeaaa

Browse files
committed
Merge branch 'main' into copilot/fix-error-message-creating-user
2 parents 2a6f897 + f5c9a15 commit 30eeaaa

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install Composer dependencies & cache dependencies
3838
if: steps.check_composer_file.outputs.files_exists == 'true'
39-
uses: ramsey/composer-install@a35c6ebd3d08125aaf8852dff361e686a1a67947 # v3
39+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v3
4040
env:
4141
COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
4242
with:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7768,7 +7768,7 @@ Display WordPress users based on all arguments supported by
77687768
Control output by one or more arguments of WP_User_Query().
77697769

77707770
[--network]
7771-
List all users in the network for multisite.
7771+
List all users in the network for multisite. Roles are not included when using this flag, as users can have different roles on different sites in a multisite network.
77727772

77737773
[--field=<field>]
77747774
Prints the value of a single field for each user.

features/user-list.feature

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,20 @@ Feature: List WordPress users
2727
bobjones
2828
"""
2929

30+
Scenario: List network users excludes roles field
31+
Given a WP multisite install
32+
And I run `wp user create bobjones bob@example.com --role=author`
33+
34+
When I run `wp user list --network --format=csv`
35+
Then STDOUT should contain:
36+
"""
37+
ID,user_login,display_name,user_email,user_registered
38+
"""
39+
And STDOUT should not contain:
40+
"""
41+
roles
42+
"""
43+
3044
@require-wp-4.9
3145
Scenario: List users without roles
3246
Given a WP install

src/User_Command.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function __construct() {
7171
* : Control output by one or more arguments of WP_User_Query().
7272
*
7373
* [--network]
74-
* : List all users in the network for multisite.
74+
* : List all users in the network for multisite. Roles are not included when using this flag, as users can have different roles on different sites in a multisite network.
7575
*
7676
* [--field=<field>]
7777
* : Prints the value of a single field for each user.

0 commit comments

Comments
 (0)